Add the browser test for the new gallery.

chrome/browser/chromeos/file_manager/file_manager_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.
 
 // Browser test for basic Chrome OS file manager functionality:
 //  - The file list is updated when a file is added externally to the Downloads
 //    folder.
 //  - Selecting a file and copy-pasting it with the keyboard copies the file.
 //  - Selecting a file and pressing delete deletes it.
 
@@ skipping 506 matching lines @@
  protected:
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE;
 
   virtual void SetUpOnMainThread() OVERRIDE;
 
   // Adds an incognito and guest-mode flags for tests in the guest mode.
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE;
 
   // Loads our testing extension and sends it a string identifying the current
   // test.
-  void StartTest();
+  virtual void StartTest();
+  void RunTestMessageLoop();
 
   // Overriding point for test configurations.
+  virtual const char* GetTestManifestName() const {
+    return "file_manager_manifest.json";

[yoshiki, 2014/06/02 21:30:16]

nit: I think manifest.json should be under file_manager directory, or
"file_manager_test_manifest.json" is better.

[hirono, 2014/06/03 01:48:41]

I renamed the files.

+  }
   virtual GuestMode GetGuestModeParam() const = 0;
   virtual const char* GetTestCaseNameParam() const = 0;
   virtual std::string OnMessage(const std::string& name,
                                 const base::Value* value);
 
   scoped_ptr<LocalTestVolume> local_volume_;
   linked_ptr<DriveTestVolume> drive_volume_;
   std::map<Profile*, linked_ptr<DriveTestVolume> > drive_volumes_;
   scoped_ptr<LocalTestVolume> usb_volume_;
 
@@ skipping 41 matching lines @@
     command_line->AppendSwitch(chromeos::switches::kGuestSession);
     command_line->AppendSwitchNative(chromeos::switches::kLoginUser, "");
     command_line->AppendSwitch(switches::kIncognito);
   }
   ExtensionApiTest::SetUpCommandLine(command_line);
 }
 
 void FileManagerBrowserTestBase::StartTest() {
   // Launch the extension.
   base::FilePath path = test_data_dir_.AppendASCII("file_manager_browsertest");
-  const extensions::Extension* extension = LoadExtensionAsComponent(path);
+  const extensions::Extension* extension = LoadExtensionAsComponentWithManifest(
+      path, GetTestManifestName());
   ASSERT_TRUE(extension);
 
+  RunTestMessageLoop();
+}
+
+void FileManagerBrowserTestBase::RunTestMessageLoop() {
   // Handle the messages from JavaScript.
   // The while loop is break when the test is passed or failed.
   FileManagerTestListener listener;
   while (true) {
     FileManagerTestListener::Message entry = listener.GetNextMessage();
     if (entry.type == chrome::NOTIFICATION_EXTENSION_TEST_PASSED) {
       // Test succeed.
       break;
     } else if (entry.type == chrome::NOTIFICATION_EXTENSION_TEST_FAILED) {
       // Test failed.
@@ skipping 457 matching lines @@
   // in and checks that nothing goes wrong. Here, the primary user (alice) logs
   // in first, then the "extra" users follow, and then lastly the other users
   // (bob and charlie) are added in the test. Thus the existing test verifies
   // that the feature is effectively working with lastly logged in users.
   AddExtraUsersForStressTesting();
 
   set_test_case_name("multiProfileVisitDesktopMenu");
   StartTest();
 }
 
+template<GuestMode M>
+class GalleryBrowserTestBase : public FileManagerBrowserTestBase {
+ public:
+  virtual GuestMode GetGuestModeParam() const OVERRIDE { return M; }
+  virtual const char* GetTestCaseNameParam() const OVERRIDE {
+    return test_case_name_.c_str();
+  }
+
+ protected:
+  virtual std::string OnMessage(const std::string& name,
+                                const base::Value* value) OVERRIDE;
+
+  virtual const char* GetTestManifestName() const OVERRIDE {
+    return "gallery_manifest.json";

[yoshiki, 2014/06/02 21:30:16]

ditto

[hirono, 2014/06/03 01:48:41]

Done.

+  }
+
+  void AddScript(const std::string& name) {
+    scripts_.AppendString(
+        "chrome-extension://ejhcmmdhhpdhhgmifplfmjobgegbibkn/" + name);
+  }
+
+  void set_test_case_name(const std::string& name) {
+    test_case_name_ = name;
+  }
+
+ private:
+  base::ListValue scripts_;
+  std::string test_case_name_;
+};
+
+template<GuestMode M>
+std::string GalleryBrowserTestBase<M>::OnMessage(const std::string& name,
+                                                 const base::Value* value) {
+  if (name == "getScripts") {
+    std::string jsonString;
+    base::JSONWriter::Write(&scripts_, &jsonString);
+    return jsonString;
+  }
+  return FileManagerBrowserTestBase::OnMessage(name, value);
+}
+
+typedef GalleryBrowserTestBase<NOT_IN_GUEST_MODE> GalleryBrowserTest;
+typedef GalleryBrowserTestBase<IN_GUEST_MODE> GalleryBrowserTestInGuestMode;
+
+IN_PROC_BROWSER_TEST_F(GalleryBrowserTest, OpenSingleImageOnDownloads) {
+  AddScript("gallery/open_image_files.js");
+  set_test_case_name("openSingleImageOnDownloads");
+  StartTest();
+}
+
+IN_PROC_BROWSER_TEST_F(GalleryBrowserTestInGuestMode,
+                       OpenSingleImageOnDownloads) {
+  AddScript("gallery/open_image_files.js");
+  set_test_case_name("openSingleImageOnDownloads");
+  StartTest();
+}
+
+IN_PROC_BROWSER_TEST_F(GalleryBrowserTest, OpenSingleImageOnDrive) {
+  AddScript("gallery/open_image_files.js");
+  set_test_case_name("openSingleImageOnDrive");
+  StartTest();
+}
+
 }  // namespace
 }  // namespace file_manager