Add support for persistent file access in apps.

apps/app_restore_service_browsertest.cc

Index: apps/app_restore_service_browsertest.cc
diff --git a/apps/app_restore_service_browsertest.cc b/apps/app_restore_service_browsertest.cc
index a335617e75ec3dcc42d43bea5541015a2e278412..8be1f03115ac3b60a6903051820d4a505abdb117 100644
--- a/apps/app_restore_service_browsertest.cc
+++ b/apps/app_restore_service_browsertest.cc
@@ -4,8 +4,8 @@
 
 #include "apps/app_restore_service.h"
 #include "apps/app_restore_service_factory.h"
-#include "chrome/browser/extensions/api/file_handlers/app_file_handler_util.h"
 #include "chrome/browser/extensions/api/file_system/file_system_api.h"
+#include "chrome/browser/extensions/api/file_system/saved_files_service.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
@@ -14,7 +14,8 @@
 #include "chrome/common/extensions/extension.h"
 #include "content/public/test/test_utils.h"
 
-using extensions::app_file_handler_util::SavedFileEntry;
+using extensions::SavedFileEntry;
+using extensions::SavedFilesService;
 using extensions::Extension;
 using extensions::ExtensionPrefs;
 using extensions::ExtensionSystem;
@@ -82,21 +83,18 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, FileAccessIsSavedToPrefs) {
   ASSERT_TRUE(extension);
   file_written_listener.WaitUntilSatisfied();
 
-  ExtensionPrefs* extension_prefs =
-      ExtensionSystem::Get(browser()->profile())->extension_prefs();
+  SavedFilesService* saved_files_service = SavedFilesService::Get(profile());
 
   // Record the file entries in prefs because when the app gets suspended it
   // will have them all cleared.
   std::vector<SavedFileEntry> file_entries;
-  extensions::app_file_handler_util::GetSavedFileEntries(
-      extension_prefs, extension->id(), &file_entries);
+  saved_files_service->GetFileEntries(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();
-  extensions::app_file_handler_util::GetSavedFileEntries(
-      extension_prefs, extension->id(), &file_entries);
+  saved_files_service->GetFileEntries(extension->id(), &file_entries);
   // File entries should be cleared when the extension is suspended.
   ASSERT_TRUE(file_entries.empty());
 }
@@ -128,12 +126,11 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, FileAccessIsRestored) {
 
   ExtensionPrefs* extension_prefs =
       ExtensionSystem::Get(browser()->profile())->extension_prefs();
+  SavedFilesService* saved_files_service = SavedFilesService::Get(profile());
   // Record the file entries in prefs because when the app gets suspended it
   // will have them all cleared.
   std::vector<SavedFileEntry> file_entries;
-  extensions::app_file_handler_util::GetSavedFileEntries(extension_prefs,
-                                                         extension->id(),
-                                                         &file_entries);
+  saved_files_service->GetFileEntries(extension->id(), &file_entries);
   extension_suspended.Wait();
 
   // Simulate a restart by populating the preferences as if the browser didn't
@@ -141,8 +138,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) {
-    extensions::app_file_handler_util::AddSavedFileEntry(
-        extension_prefs, extension->id(), it->id, it->path, it->writable);
+    saved_files_service->AddFileEntry(
+        extension->id(), it->id, it->path, it->writable);
   }
 
   apps::AppRestoreServiceFactory::GetForProfile(browser()->profile())->