Expose gallery watching functionality to the public mediaGalleries API.

chrome/browser/extensions/api/media_galleries/media_galleries_watch_apitest.cc

Index: chrome/browser/extensions/api/media_galleries/media_galleries_watch_apitest.cc
diff --git a/chrome/browser/extensions/api/media_galleries_private/media_galleries_watch_apitest.cc b/chrome/browser/extensions/api/media_galleries/media_galleries_watch_apitest.cc
similarity index 85%
copy from chrome/browser/extensions/api/media_galleries_private/media_galleries_watch_apitest.cc
copy to chrome/browser/extensions/api/media_galleries/media_galleries_watch_apitest.cc
index a88cac6fb6c84835f6179a60c7ed7ec5b4578e54..400a7783daf1cff7733b289399d031970a217b68 100644
--- a/chrome/browser/extensions/api/media_galleries_private/media_galleries_watch_apitest.cc
+++ b/chrome/browser/extensions/api/media_galleries/media_galleries_watch_apitest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// MediaGalleriesPrivate gallery watch API browser tests.
+// MediaGalleries gallery watch API browser tests.
 
 #include "base/file_util.h"
 #include "base/files/file_path.h"
@@ -30,12 +30,14 @@ namespace {
 // Id of test extension from
 // chrome/test/data/extensions/api_test/|kTestExtensionPath|
 const char kTestExtensionId[] = "gceegfkgibmgpfopknlcgleimclbknie";
-const char kTestExtensionPath[] = "media_galleries_private/gallerywatch";
+const char kTestExtensionPath[] = "media_galleries/gallerywatch";
 
 // JS commands.
 const char kGetAllWatchedGalleryIdsCmd[] = "getAllWatchedGalleryIds()";
 const char kGetMediaFileSystemsCmd[] = "getMediaFileSystems()";
 const char kSetupWatchOnValidGalleriesCmd[] = "setupWatchOnValidGalleries()";
+const char kSetupWatchOnUnlistenedValidGalleriesCmd[] =
+    "setupWatchOnUnlistenedValidGalleries()";
 const char kAddGalleryChangedListenerCmd[] = "addGalleryChangedListener()";
 const char kRemoveAllGalleryWatchCmd[] = "removeAllGalleryWatch()";
 const char kRemoveGalleryChangedListenerCmd[] =
@@ -58,6 +60,8 @@ const char kRemoveGalleryWatchOK[] = "remove_gallery_watch_ok";
 // Test reply messages.
 const char kNoGalleryWatchesInstalled[] = "gallery_watchers_does_not_exists";
 const char kAddGalleryWatchRequestFailed[] = "add_watch_request_failed";
+const char kAddGalleryWatchRequestRuntimeError[] =
+    "add_watch_request_runtime_error";
 const char kAddGalleryWatchRequestSucceeded[] = "add_watch_request_succeeded";
 const char kGalleryChangedEventReceived[] = "gallery_changed_event_received";
 const char kGalleryWatchesCheck[] = "gallery_watcher_checks";
@@ -66,16 +70,16 @@ const char kGalleryWatchesCheck[] = "gallery_watcher_checks";
 
 
 ///////////////////////////////////////////////////////////////////////////////
-//                 MediaGalleriesPrivateGalleryWatchApiTest                  //
+//                 MediaGalleriesGalleryWatchApiTest                         //
 ///////////////////////////////////////////////////////////////////////////////
 
-class MediaGalleriesPrivateGalleryWatchApiTest : public ExtensionApiTest {
+class MediaGalleriesGalleryWatchApiTest : public ExtensionApiTest {
  public:
-  MediaGalleriesPrivateGalleryWatchApiTest()
+  MediaGalleriesGalleryWatchApiTest()
       : extension_(NULL),
         background_host_(NULL) {
   }
-  virtual ~MediaGalleriesPrivateGalleryWatchApiTest() {}
+  virtual ~MediaGalleriesGalleryWatchApiTest() {}
 
  protected:
   // ExtensionApiTest overrides.
@@ -183,7 +187,7 @@ class MediaGalleriesPrivateGalleryWatchApiTest : public ExtensionApiTest {
 
   content::RenderViewHost* background_host_;
 
-  DISALLOW_COPY_AND_ASSIGN(MediaGalleriesPrivateGalleryWatchApiTest);
+  DISALLOW_COPY_AND_ASSIGN(MediaGalleriesGalleryWatchApiTest);
 };
 
 // Crashing on OSX.
@@ -192,17 +196,19 @@ class MediaGalleriesPrivateGalleryWatchApiTest : public ExtensionApiTest {
 #else
 #define MAYBE_BasicGalleryWatch BasicGalleryWatch
 #endif
-IN_PROC_BROWSER_TEST_F(MediaGalleriesPrivateGalleryWatchApiTest,
+IN_PROC_BROWSER_TEST_F(MediaGalleriesGalleryWatchApiTest,
                        MAYBE_BasicGalleryWatch) {
-  SetupGalleryWatches();
 
   // Add gallery watch listener.
   ExecuteCmdAndCheckReply(kAddGalleryChangedListenerCmd,
                           kAddGalleryChangedListenerOK);
 
+  SetupGalleryWatches();
+
   // Modify gallery contents.
   ExtensionTestMessageListener gallery_change_event_received(
       kGalleryChangedEventReceived, false  /* no reply */);
+
   ASSERT_TRUE(AddNewFileInTestGallery());
   if (GalleryWatchesSupported())
     EXPECT_TRUE(gallery_change_event_received.WaitUntilSatisfied());
@@ -217,7 +223,7 @@ IN_PROC_BROWSER_TEST_F(MediaGalleriesPrivateGalleryWatchApiTest,
 }
 
 // http://crbug.com/390979
-IN_PROC_BROWSER_TEST_F(MediaGalleriesPrivateGalleryWatchApiTest,
+IN_PROC_BROWSER_TEST_F(MediaGalleriesGalleryWatchApiTest,
                        DISABLED_RemoveListenerAndModifyGallery) {

[tommycli, 2014/08/19 16:36:03]

This should not be DISABLED anymore, since we are overhauling the test.

[Oren Blasberg, 2014/08/20 22:59:37]

Will remove it in followup CL.

   if (!GalleryWatchesSupported())
     return;
@@ -244,23 +250,19 @@ IN_PROC_BROWSER_TEST_F(MediaGalleriesPrivateGalleryWatchApiTest,
   ExecuteCmdAndCheckReply(kRemoveGalleryWatchCmd, kRemoveGalleryWatchOK);
 }
 
-IN_PROC_BROWSER_TEST_F(MediaGalleriesPrivateGalleryWatchApiTest,
+IN_PROC_BROWSER_TEST_F(MediaGalleriesGalleryWatchApiTest,
                        SetupGalleryWatchWithoutListeners) {
   if (!GalleryWatchesSupported())
     return;
 
-  SetupGalleryWatches();
-
-  // No listeners, modify gallery contents.
-  ExtensionTestMessageListener gallery_change_event_received(
-      kGalleryChangedEventReceived, false  /* no reply */);
-  ASSERT_TRUE(AddNewFileInTestGallery());
-
-  // Remove gallery watch.
-  ExecuteCmdAndCheckReply(kRemoveGalleryWatchCmd, kRemoveGalleryWatchOK);
+  ExtensionTestMessageListener add_watch_runtime_error_received(
+      kAddGalleryWatchRequestRuntimeError, false /* no reply */);
+  ExecuteCmdAndCheckReply(

[tommycli, 2014/08/19 16:36:02]

This concerns me since you should get multiple messages (one for each gallery),
but we proceed after getting one right?

[Oren Blasberg, 2014/08/20 22:59:37]

Done.

+      kSetupWatchOnUnlistenedValidGalleriesCmd, kAddGalleryWatchOK);
+  EXPECT_TRUE(add_watch_runtime_error_received.WaitUntilSatisfied());
 }
 
-IN_PROC_BROWSER_TEST_F(MediaGalleriesPrivateGalleryWatchApiTest,
+IN_PROC_BROWSER_TEST_F(MediaGalleriesGalleryWatchApiTest,
                        SetupGalleryChangedListenerWithoutWatchers) {
   // Add gallery watch listener.
   ExecuteCmdAndCheckReply(kAddGalleryChangedListenerCmd,
@@ -277,8 +279,11 @@ IN_PROC_BROWSER_TEST_F(MediaGalleriesPrivateGalleryWatchApiTest,
                           kRemoveGalleryChangedListenerOK);
 }
 
-IN_PROC_BROWSER_TEST_F(MediaGalleriesPrivateGalleryWatchApiTest,
+IN_PROC_BROWSER_TEST_F(MediaGalleriesGalleryWatchApiTest,
                        SetupWatchOnInvalidGallery) {
+  // Add gallery watch listener.
+  ExecuteCmdAndCheckReply(kAddGalleryChangedListenerCmd,
+                          kAddGalleryChangedListenerOK);
   // Set up a invalid gallery watch.
   ExtensionTestMessageListener invalid_gallery_watch_request_finished(
       kAddGalleryWatchRequestFailed, false  /* no reply */);
@@ -286,10 +291,14 @@ IN_PROC_BROWSER_TEST_F(MediaGalleriesPrivateGalleryWatchApiTest,
   EXPECT_TRUE(invalid_gallery_watch_request_finished.WaitUntilSatisfied());
 }
 
-IN_PROC_BROWSER_TEST_F(MediaGalleriesPrivateGalleryWatchApiTest,
+IN_PROC_BROWSER_TEST_F(MediaGalleriesGalleryWatchApiTest,
                        GetAllGalleryWatch) {
+  // Add gallery watch listener.
+  ExecuteCmdAndCheckReply(kAddGalleryChangedListenerCmd,
+                          kAddGalleryChangedListenerOK);
+
   // Gallery watchers are not yet added.
-  // chrome.mediaGalleriesPrivate.getAllGalleryWatch should return an empty
+  // chrome.mediaGalleries.getAllGalleryWatch should return an empty
   // list.
   ExtensionTestMessageListener initial_get_all_check_finished(
       kNoGalleryWatchesInstalled, false  /* no reply */);
@@ -301,7 +310,7 @@ IN_PROC_BROWSER_TEST_F(MediaGalleriesPrivateGalleryWatchApiTest,
 
   SetupGalleryWatches();
 
-  // chrome.mediaGalleriesPrivate.getAllGalleryWatch should return the
+  // chrome.mediaGalleries.getAllGalleryWatch should return the
   // gallery identifiers.
   ExtensionTestMessageListener get_all_watched_galleries_finished(
       kGalleryWatchesCheck, false  /* no reply */);
@@ -312,7 +321,7 @@ IN_PROC_BROWSER_TEST_F(MediaGalleriesPrivateGalleryWatchApiTest,
   ExecuteCmdAndCheckReply(kRemoveGalleryWatchCmd, kRemoveGalleryWatchOK);
 
   // Gallery watchers removed.
-  // chrome.mediaGalleriesPrivate.getAllGalleryWatch() should return an empty
+  // chrome.mediaGalleries.getAllGalleryWatch() should return an empty
   // list.
   ExtensionTestMessageListener final_get_all_check_finished(
       kNoGalleryWatchesInstalled, false  /* no reply */);
@@ -320,14 +329,18 @@ IN_PROC_BROWSER_TEST_F(MediaGalleriesPrivateGalleryWatchApiTest,
   EXPECT_TRUE(final_get_all_check_finished.WaitUntilSatisfied());
 }
 
-IN_PROC_BROWSER_TEST_F(MediaGalleriesPrivateGalleryWatchApiTest,
+IN_PROC_BROWSER_TEST_F(MediaGalleriesGalleryWatchApiTest,
                        RemoveAllGalleryWatch) {
+  // Add gallery watch listener.
+  ExecuteCmdAndCheckReply(kAddGalleryChangedListenerCmd,
+                          kAddGalleryChangedListenerOK);
+
   if (!GalleryWatchesSupported())
     return;
 
   SetupGalleryWatches();
 
-  // chrome.mediaGalleriesPrivate.getAllGalleryWatch should return the watched
+  // chrome.mediaGalleries.getAllGalleryWatch should return the watched
   // gallery identifiers.
   ExtensionTestMessageListener get_all_watched_galleries_finished(
       kGalleryWatchesCheck, false  /* no reply */);
@@ -337,7 +350,7 @@ IN_PROC_BROWSER_TEST_F(MediaGalleriesPrivateGalleryWatchApiTest,
   // Remove all gallery watchers.
   ExecuteCmdAndCheckReply(kRemoveAllGalleryWatchCmd, kRemoveAllGalleryWatchOK);
 
-  // Gallery watchers removed. chrome.mediaGalleriesPrivate.getAllGalleryWatch
+  // Gallery watchers removed. chrome.mediaGalleries.getAllGalleryWatch
   // should return an empty list.
   ExtensionTestMessageListener final_get_all_check_finished(
       kNoGalleryWatchesInstalled, false  /* no reply */);