Enable gallery watches on Mac

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

 // Copyright (c) 2012 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.
 //
 // MediaGalleriesPrivate gallery watch API browser tests.
 
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/media_galleries/media_galleries_test_util.h"
 #include "chrome/common/chrome_paths.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/switches.h"
 
 namespace {
 
 // Id of test extension from
 // chrome/test/data/extensions/api_test/|kTestExtensionPath|
 const char kTestExtensionId[] = "gceegfkgibmgpfopknlcgleimclbknie";
 const char kTestExtensionPath[] = "media_galleries_private/gallerywatch";
 
-#if !defined(OS_CHROMEOS)

[vandebo (ex-Chrome), 2014/06/14 00:45:11]

We'll see what happens when this comes out...

 // JS commands.
 const char kGetAllWatchedGalleryIdsCmd[] = "getAllWatchedGalleryIds()";
 const char kGetMediaFileSystemsCmd[] = "getMediaFileSystems()";
 const char kSetupWatchOnValidGalleriesCmd[] = "setupWatchOnValidGalleries()";
-#if defined(OS_WIN) || defined(OS_LINUX)
 const char kAddGalleryChangedListenerCmd[] = "addGalleryChangedListener()";
 const char kRemoveAllGalleryWatchCmd[] = "removeAllGalleryWatch()";
 const char kRemoveGalleryChangedListenerCmd[] =
     "removeGalleryChangedListener()";
 const char kRemoveGalleryWatchCmd[] = "removeGalleryWatch()";
 const char kSetupWatchOnInvalidGalleryCmd[] = "setupWatchOnInvalidGallery()";
-#endif  // defined(OS_WIN) || defined(OS_LINUX)
 
 // And JS reply messages.
 const char kAddGalleryWatchOK[] = "add_gallery_watch_ok";
 const char kGetAllGalleryWatchOK[] = "get_all_gallery_watch_ok";
 const char kGetMediaFileSystemsCallbackOK[] =
     "get_media_file_systems_callback_ok";
 const char kGetMediaFileSystemsOK[] = "get_media_file_systems_ok";
-#if defined(OS_WIN) || defined(OS_LINUX)
 const char kAddGalleryChangedListenerOK[] = "add_gallery_changed_listener_ok";
 const char kRemoveAllGalleryWatchOK[] = "remove_all_gallery_watch_ok";
 const char kRemoveGalleryChangedListenerOK[] =
     "remove_gallery_changed_listener_ok";
 const char kRemoveGalleryWatchOK[] = "remove_gallery_watch_ok";
-#endif  // defined(OS_WIN) || defined(OS_LINUX)
 
 // Test reply messages.
 const char kGetAllGalleryWatchResultA[] = "gallery_watchers_does_not_exists";
 const char kAddGalleryWatchRequestFailed[] = "add_watch_request_failed";
-#if defined(OS_WIN) || defined(OS_LINUX)
 const char kAddGalleryWatchRequestSucceeded[] = "add_watch_request_succeeded";
 const char kGalleryChangedEventReceived[] = "gallery_changed_event_received";
 const char kGetAllGalleryWatchResultB[] =
     "watchers_for_galleries_{1, 2, 3}_found";
-#endif  // defined(OS_WIN) || defined(OS_LINUX)
-#endif  // !defined(OS_CHROMEOS)
 
 }  // namespace
 
 
 ///////////////////////////////////////////////////////////////////////////////
 //                 MediaGalleriesPrivateGalleryWatchApiTest                  //
 ///////////////////////////////////////////////////////////////////////////////
 
 class MediaGalleriesPrivateGalleryWatchApiTest : public ExtensionApiTest {
  public:
@@ skipping 43 matching lines @@
       return NULL;
     return extensions::ExtensionSystem::Get(browser()->profile())->
         process_manager()->GetBackgroundHostForExtension(extension->id())->
            render_view_host();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MediaGalleriesPrivateGalleryWatchApiTest);
 };
 
-
-#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
 IN_PROC_BROWSER_TEST_F(MediaGalleriesPrivateGalleryWatchApiTest,
                        BasicGalleryWatch) {
   EnsureMediaDirectoriesExists media_directories;
   content::RenderViewHost* host = GetBackgroundHostForTestExtension();
   ASSERT_TRUE(host);
 
   // Get media file systems.
   ExtensionTestMessageListener get_media_systems_finished(
       kGetMediaFileSystemsCallbackOK, false  /* no reply */);
   ExecuteCmdAndCheckReply(host, kGetMediaFileSystemsCmd,
@@ skipping 225 matching lines @@
                           kRemoveAllGalleryWatchOK);
 
   // Gallery watchers removed. chrome.mediaGalleriesPrivate.getAllGalleryWatch
   // should return an empty list.
   ExtensionTestMessageListener final_get_all_check_finished(
       kGetAllGalleryWatchResultA, false  /* no reply */);
   ExecuteCmdAndCheckReply(host, kGetAllWatchedGalleryIdsCmd,
                           kGetAllGalleryWatchOK);
   EXPECT_TRUE(final_get_all_check_finished.WaitUntilSatisfied());
 }
-#endif  // defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-
-#if defined(OS_MACOSX)
-// Gallery watch request is not enabled on Mac: crbug.com/144491.
-IN_PROC_BROWSER_TEST_F(MediaGalleriesPrivateGalleryWatchApiTest,
-                       SetupGalleryWatch) {
-  EnsureMediaDirectoriesExists media_directories;
-  content::RenderViewHost* host = GetBackgroundHostForTestExtension();
-  ASSERT_TRUE(host);
-
-  // Get media file systems.
-  ExtensionTestMessageListener get_media_systems_finished(
-      kGetMediaFileSystemsCallbackOK, false  /* no reply */);
-  ExecuteCmdAndCheckReply(host, kGetMediaFileSystemsCmd,
-                          kGetMediaFileSystemsOK);
-  EXPECT_TRUE(get_media_systems_finished.WaitUntilSatisfied());
-
-  // Set up a invalid gallery watch.
-  ExtensionTestMessageListener gallery_watch_request_finished(
-      kAddGalleryWatchRequestFailed, false  /* no reply */);
-  // Set up gallery watch.
-  ExecuteCmdAndCheckReply(host, kSetupWatchOnValidGalleriesCmd,
-                          kAddGalleryWatchOK);
-  EXPECT_TRUE(gallery_watch_request_finished.WaitUntilSatisfied());
-}
-
-IN_PROC_BROWSER_TEST_F(MediaGalleriesPrivateGalleryWatchApiTest,
-                       GetAllGalleryWatch) {
-  EnsureMediaDirectoriesExists media_directories;
-  content::RenderViewHost* host = GetBackgroundHostForTestExtension();
-  ASSERT_TRUE(host);
-
-  // Get media file systems.
-  ExtensionTestMessageListener get_media_systems_finished(
-      kGetMediaFileSystemsCallbackOK, false  /* no reply */);
-  ExecuteCmdAndCheckReply(host, kGetMediaFileSystemsCmd,
-                          kGetMediaFileSystemsOK);
-  EXPECT_TRUE(get_media_systems_finished.WaitUntilSatisfied());
-
-  // Set up gallery watch.
-  ExecuteCmdAndCheckReply(host, kSetupWatchOnValidGalleriesCmd,
-                          kAddGalleryWatchOK);
-
-  // Gallery watchers does not exists.
-  // chrome.mediaGalleriesPrivate.getAllGalleryWatch should return an empty
-  // list.
-  ExtensionTestMessageListener get_all_gallery_watch_finished(
-      kGetAllGalleryWatchResultA, false  /* no reply */);
-  ExecuteCmdAndCheckReply(host, kGetAllWatchedGalleryIdsCmd,
-                          kGetAllGalleryWatchOK);
-  EXPECT_TRUE(get_all_gallery_watch_finished.WaitUntilSatisfied());
-}
-#endif  // defined(OS_MACOSX)