Postpone setting up file handler's file permissions if handler is running lazy background page.

chrome/browser/chromeos/extensions/external_filesystem_apitest.cc

Index: chrome/browser/chromeos/extensions/external_filesystem_apitest.cc
diff --git a/chrome/browser/chromeos/extensions/external_filesystem_apitest.cc b/chrome/browser/chromeos/extensions/external_filesystem_apitest.cc
index 2f3aa93500b890d45c5880076e270069c36934f2..a4120bc2a00af0b6d37d27c881be87a5b00b0838 100644
--- a/chrome/browser/chromeos/extensions/external_filesystem_apitest.cc
+++ b/chrome/browser/chromeos/extensions/external_filesystem_apitest.cc
@@ -8,13 +8,18 @@
 #include "base/scoped_temp_dir.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/chromeos/gdata/gdata_file_system_proxy.h"
+#include "chrome/browser/chromeos/gdata/gdata_util.h"
 #include "chrome/browser/extensions/extension_apitest.h"
+#include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/common/chrome_notification_types.h"
+#include "chrome/common/chrome_switches.h"
+#include "chrome/test/base/ui_test_utils.h"
+#include "content/public/browser/notification_service.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_mount_point_provider.h"
-#include "chrome/browser/chromeos/gdata/gdata_util.h"
 #include "webkit/chromeos/fileapi/remote_file_system_proxy.h"
 
 using ::testing::_;
@@ -34,6 +39,33 @@ const char kFileBrowserExtensionId[] = "ddammdhioacbehjngdmkjcjbnfginlla";
 const int kComponentFlags = ExtensionApiTest::kFlagEnableFileAccess |
                             ExtensionApiTest::kFlagLoadAsComponent;
 
+// Helper class to wait for a background page to load or close again.
+// TODO(tbarzic): We can probably share this with e.g.
+//                lazy_background_page_apitest.
+class BackgroundObserver {
+ public:
+  BackgroundObserver()
+      : page_created_(chrome::NOTIFICATION_EXTENSION_BACKGROUND_PAGE_READY,
+                      content::NotificationService::AllSources()),
+        page_closed_(chrome::NOTIFICATION_EXTENSION_HOST_DESTROYED,
+                     content::NotificationService::AllSources()) {
+  }
+
+  // TODO(tbarzic): Use this for file handlers in the rest of the tests
+  // (instead of calling chrome.test.succeed in js).
+  void WaitUntilLoaded() {
+    page_created_.Wait();
+  }
+
+  void WaitUntilClosed() {
+    page_closed_.Wait();
+  }
+
+ private:
+  ui_test_utils::WindowedNotificationObserver page_created_;
+  ui_test_utils::WindowedNotificationObserver page_closed_;
+};
+
 // Returns the expected URL for the given path.
 GURL GetExpectedURL(const std::string& path) {
   return GURL(
@@ -118,6 +150,11 @@ class FileSystemExtensionApiTest : public ExtensionApiTest {
 
   virtual ~FileSystemExtensionApiTest() {}
 
+  void SetUpCommandLine(CommandLine* command_line) {
+    ExtensionApiTest::SetUpCommandLine(command_line);
+    command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis);
+  }
+
   // Adds a local mount point at at mount point /tmp.
   void AddTmpMountPoint() {
     fileapi::ExternalFileSystemMountPointProvider* provider =
@@ -126,6 +163,17 @@ class FileSystemExtensionApiTest : public ExtensionApiTest {
     provider->AddLocalMountPoint(test_mount_point_);
   }
 
+  // Loads the extension, which temporarily starts the lazy background page
+  // to dispatch the onInstalled event. We wait until it shuts down again.
+  const Extension* LoadExtensionAndWait(const std::string& test_name) {
+    BackgroundObserver page_complete;
+    FilePath extdir = test_data_dir_.AppendASCII(test_name);
+    const Extension* extension = LoadExtension(extdir);
+    if (extension)
+      page_complete.WaitUntilClosed();
+    return extension;
+  }
+
  private:
   FilePath test_mount_point_;
 };
@@ -191,6 +239,14 @@ IN_PROC_BROWSER_TEST_F(FileSystemExtensionApiTest, FileBrowserTest) {
       "filebrowser_component", "read.html", kComponentFlags)) << message_;
 }
 
+IN_PROC_BROWSER_TEST_F(FileSystemExtensionApiTest, FileBrowserTestLazy) {
+  AddTmpMountPoint();
+  ASSERT_TRUE(LoadExtensionAndWait("filesystem_handler_lazy_background"))
+      << message_;
+  ASSERT_TRUE(RunExtensionSubtest(
+      "filebrowser_component", "read.html", kComponentFlags)) << message_;
+}
+
 IN_PROC_BROWSER_TEST_F(FileSystemExtensionApiTest, FileBrowserTestWrite) {
   AddTmpMountPoint();
   ASSERT_TRUE(RunExtensionTest("filesystem_handler_write")) << message_;