Merge from Chromium at DEPS revision r199464

This commit was generated by merge_to_master.py.

Change-Id: Ic3d1f97a4fb4edd1e6ed66a70b5040da1622b5a9

2 files changed, 18 insertions, 14 deletions

diff --git a/apps/app_restore_service.cc b/apps/app_restore_service.cc
index 66f2a73bf9..f8932fbc01 100644
--- a/apps/app_restore_service.cc
+++ b/apps/app_restore_service.cc
@@ -68,7 +68,9 @@ void AppRestoreService::HandleStartup(bool should_restore_apps) {
     const Extension* extension = *it;
     if (extension_prefs->IsExtensionRunning(extension->id())) {
       std::vector<SavedFileEntry> file_entries;
-      extension_prefs->GetSavedFileEntries(extension->id(), &file_entries);
+      extensions::app_file_handler_util::GetSavedFileEntries(extension_prefs,
+                                                             extension->id(),
+                                                             &file_entries);
       RecordAppStop(extension->id());
       if (should_restore_apps)
         RestoreApp(*it, file_entries);
@@ -116,7 +118,8 @@ void AppRestoreService::RecordAppStop(const std::string& extension_id) {
   ExtensionPrefs* extension_prefs =
       ExtensionSystem::Get(profile_)->extension_service()->extension_prefs();
   extension_prefs->SetExtensionRunning(extension_id, false);
-  extension_prefs->ClearSavedFileEntries(extension_id);
+  extensions::app_file_handler_util::ClearSavedFileEntries(
+      extension_prefs, extension_id);
 }
 
 void AppRestoreService::RestoreApp(
diff --git a/apps/app_restore_service_browsertest.cc b/apps/app_restore_service_browsertest.cc
index d0dac93b39..a335617e75 100644
--- a/apps/app_restore_service_browsertest.cc
+++ b/apps/app_restore_service_browsertest.cc
@@ -82,20 +82,21 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, FileAccessIsSavedToPrefs) {
   ASSERT_TRUE(extension);
   file_written_listener.WaitUntilSatisfied();
 
-  ExtensionService* extension_service =
-      ExtensionSystem::Get(browser()->profile())->extension_service();
-  ExtensionPrefs* extension_prefs = extension_service->extension_prefs();
+  ExtensionPrefs* extension_prefs =
+      ExtensionSystem::Get(browser()->profile())->extension_prefs();
 
   // Record the file entries in prefs because when the app gets suspended it
   // will have them all cleared.
   std::vector<SavedFileEntry> file_entries;
-  extension_prefs->GetSavedFileEntries(extension->id(), &file_entries);
+  extensions::app_file_handler_util::GetSavedFileEntries(
+      extension_prefs, extension->id(), &file_entries);
   // One for the read-only file entry and one for the writable file entry.
   ASSERT_EQ(2u, file_entries.size());
 
   extension_suspended.Wait();
   file_entries.clear();
-  extension_prefs->GetSavedFileEntries(extension->id(), &file_entries);
+  extensions::app_file_handler_util::GetSavedFileEntries(
+      extension_prefs, extension->id(), &file_entries);
   // File entries should be cleared when the extension is suspended.
   ASSERT_TRUE(file_entries.empty());
 }
@@ -125,14 +126,14 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, FileAccessIsRestored) {
   ASSERT_TRUE(extension);
   file_written_listener.WaitUntilSatisfied();
 
-  ExtensionService* extension_service =
-      ExtensionSystem::Get(browser()->profile())->extension_service();
-  ExtensionPrefs* extension_prefs = extension_service->extension_prefs();
-
+  ExtensionPrefs* extension_prefs =
+      ExtensionSystem::Get(browser()->profile())->extension_prefs();
   // Record the file entries in prefs because when the app gets suspended it
   // will have them all cleared.
   std::vector<SavedFileEntry> file_entries;
-  extension_prefs->GetSavedFileEntries(extension->id(), &file_entries);
+  extensions::app_file_handler_util::GetSavedFileEntries(extension_prefs,
+                                                         extension->id(),
+                                                         &file_entries);
   extension_suspended.Wait();
 
   // Simulate a restart by populating the preferences as if the browser didn't
@@ -140,8 +141,8 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, FileAccessIsRestored) {
   extension_prefs->SetExtensionRunning(extension->id(), true);
   for (std::vector<SavedFileEntry>::const_iterator it = file_entries.begin();
        it != file_entries.end(); ++it) {
-    extension_prefs->AddSavedFileEntry(
-        extension->id(), it->id, it->path, it->writable);
+    extensions::app_file_handler_util::AddSavedFileEntry(
+        extension_prefs, extension->id(), it->id, it->path, it->writable);
   }
 
   apps::AppRestoreServiceFactory::GetForProfile(browser()->profile())->