MediaGalleriesGalleryWatchApiTest: Enable tests that were disabled.

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

 // Copyright 2014 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.
 //
 // MediaGalleries gallery watch API browser tests.
 
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/files/file_path_watcher.h"
 #include "base/path_service.h"
@@ skipping 174 matching lines @@
 
   base::ScopedTempDir test_gallery_;
 
   const extensions::Extension* extension_;
 
   content::RenderViewHost* background_host_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaGalleriesGalleryWatchApiTest);
 };
 
-// Crashing on OSX.
-#if defined(OS_MACOSX)
-#define MAYBE_BasicGalleryWatch DISABLED_BasicGalleryWatch
-#else
-#define MAYBE_BasicGalleryWatch BasicGalleryWatch
-#endif
 IN_PROC_BROWSER_TEST_F(MediaGalleriesGalleryWatchApiTest,
-                       MAYBE_BasicGalleryWatch) {
+                       BasicGalleryWatch) {

[Lei Zhang, 2014/09/02 18:56:53]

fits on prev line

[Oren Blasberg, 2014/09/02 19:04:11]

Done.

   // Add gallery watch listener.
   ExecuteCmdAndCheckReply(kAddGalleryChangedListenerCmd,
                           kAddGalleryChangedListenerOK);
 
   SetupGalleryWatches();
 
   // Modify gallery contents.
   ExtensionTestMessageListener gallery_change_event_received(
       kGalleryChangedEventReceived, false /* no reply */);
 
@@ skipping 21 matching lines @@
   SetupGalleryWatches();
 
 
   // Modify gallery contents; expect correct details.
   ExtensionTestMessageListener got_correct_details(
       kOnGalleryChangedCheckingOK, false);
   ASSERT_TRUE(AddNewFileInTestGallery());
   EXPECT_TRUE(got_correct_details.WaitUntilSatisfied());
 }
 
-// http://crbug.com/390979
 IN_PROC_BROWSER_TEST_F(MediaGalleriesGalleryWatchApiTest,
-                       DISABLED_RemoveListenerAndModifyGallery) {
+                       RemoveListenerAndModifyGallery) {
   if (!GalleryWatchesSupported())
     return;
 
   // Add a gallery watch listener.
   ExecuteCmdAndCheckReply(kAddGalleryChangedListenerCmd,
                           kAddGalleryChangedListenerOK);
   SetupGalleryWatches();
 
   // Modify gallery contents.
   ExtensionTestMessageListener gallery_change_event_received(
@@ skipping 106 matching lines @@
   // Remove all gallery watchers.
   ExecuteCmdAndCheckReply(kRemoveAllGalleryWatchCmd, kRemoveAllGalleryWatchOK);
 
   // Gallery watchers removed. chrome.mediaGalleries.getAllGalleryWatch
   // should return an empty list.
   ExtensionTestMessageListener final_get_all_check_finished(
       kNoGalleryWatchesInstalled, false /* no reply */);
   ExecuteCmdAndCheckReply(kGetAllWatchedGalleryIdsCmd, kGetAllGalleryWatchOK);
   EXPECT_TRUE(final_get_all_check_finished.WaitUntilSatisfied());
 }