Add support for persistent file access in apps.

apps/app_restore_service_browsertest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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 "apps/saved_files_service.h"
 #include "chrome/browser/extensions/api/file_system/file_system_api.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/extensions/platform_app_browsertest_util.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/public/test/test_utils.h"
 
-using extensions::app_file_handler_util::SavedFileEntry;
 using extensions::Extension;
 using extensions::ExtensionPrefs;
 using extensions::ExtensionSystem;
 using extensions::FileSystemChooseEntryFunction;
 
 // TODO(benwells): Move PlatformAppBrowserTest to apps namespace in apps
 // component.
 using extensions::PlatformAppBrowserTest;
 
 namespace apps {
@@ skipping 45 matching lines @@
 
   ExtensionTestMessageListener file_written_listener("fileWritten", false);
   ExtensionTestMessageListener access_ok_listener(
       "restartedFileAccessOK", false);
 
   const Extension* extension =
       LoadAndLaunchPlatformApp("file_access_saved_to_prefs_test");
   ASSERT_TRUE(extension);
   file_written_listener.WaitUntilSatisfied();
 
-  ExtensionPrefs* extension_prefs =
-      ExtensionPrefs::Get(browser()->profile());
+  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.

[koz (OOO until 15th September), 2013/05/20 05:33:51]

This comment is probably doing more harm than good now, could you remove it?

[Sam McNally, 2013/05/20 07:13:33]

Done.

-  std::vector<SavedFileEntry> file_entries;
-  extensions::app_file_handler_util::GetSavedFileEntries(
-      extension_prefs, extension->id(), &file_entries);
+  std::vector<SavedFileEntry> file_entries =
+      saved_files_service->GetAllFileEntries(extension->id());
   // 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();

[koz (OOO until 15th September), 2013/05/20 05:33:51]

No need to clear file_entries here.

[Sam McNally, 2013/05/20 07:13:33]

Done.

-  extensions::app_file_handler_util::GetSavedFileEntries(
-      extension_prefs, extension->id(), &file_entries);
+  file_entries = saved_files_service->GetAllFileEntries(extension->id());
   // File entries should be cleared when the extension is suspended.
   ASSERT_TRUE(file_entries.empty());
 }
 
 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, FileAccessIsRestored) {
   content::WindowedNotificationObserver extension_suspended(
       chrome::NOTIFICATION_EXTENSION_HOST_DESTROYED,
       content::NotificationService::AllSources());
 
   base::ScopedTempDir temp_directory;
@@ skipping 11 matching lines @@
   ExtensionTestMessageListener access_ok_listener(
       "restartedFileAccessOK", false);
 
   const Extension* extension =
       LoadAndLaunchPlatformApp("file_access_restored_test");
   ASSERT_TRUE(extension);
   file_written_listener.WaitUntilSatisfied();
 
   ExtensionPrefs* extension_prefs =
       ExtensionPrefs::Get(browser()->profile());
+  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.

[koz (OOO until 15th September), 2013/05/20 05:33:51]

Same here.

[Sam McNally, 2013/05/20 07:13:33]

Done.

-  std::vector<SavedFileEntry> file_entries;
-  extensions::app_file_handler_util::GetSavedFileEntries(extension_prefs,
-                                                         extension->id(),
-                                                         &file_entries);
+  std::vector<SavedFileEntry> file_entries =
+      saved_files_service->GetAllFileEntries(extension->id());
   extension_suspended.Wait();
 
   // Simulate a restart by populating the preferences as if the browser didn't
   // get time to clean itself up.
   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->RetainFileEntry(
+        extension->id(), it->id, it->path, it->writable);
   }
 
   apps::AppRestoreServiceFactory::GetForProfile(browser()->profile())->
       HandleStartup(true);
 
   access_ok_listener.WaitUntilSatisfied();
 }
 
 }  // namespace apps