Revert of Disable failing tests on Mac 10.10 Release (ATI)

chrome/browser/extensions/api/tab_capture/tab_capture_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.
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/stringprintf.h"
 #include "base/thread_task_runner_handle.h"
@@ skipping 156 matching lines @@
 
 // Tests that there is a maximum limitation to the number of simultaneous
 // off-screen tabs.
 IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, MaxOffscreenTabs) {
   AddExtensionToCommandLineWhitelist();
   ASSERT_TRUE(RunExtensionSubtest("tab_capture", "max_offscreen_tabs.html"))
       << message_;
 }
 
 // Tests that tab capture video frames can be received in a VIDEO element.
-// Disabled in MacOS: https://crbug.com/557929
-#if defined(OS_MACOSX)
-#define MAYBE_EndToEndWithoutRemoting DISABLED_EndToEndWithoutRemoting
-#else
-#define MAYBE_EndToEndWithoutRemoting EndToEndWithoutRemoting
-#endif
-IN_PROC_BROWSER_TEST_F(TabCaptureApiPixelTest, MAYBE_EndToEndWithoutRemoting) {
+IN_PROC_BROWSER_TEST_F(TabCaptureApiPixelTest, EndToEndWithoutRemoting) {
   if (IsTooIntensiveForThisPlatform()) {
     LOG(WARNING) << "Skipping this CPU-intensive test on this platform/build.";
     return;
   }
   AddExtensionToCommandLineWhitelist();
   ASSERT_TRUE(RunExtensionSubtest(
       "tab_capture", "end_to_end.html?method=local&colorDeviation=10"))
       << message_;
 }
 
 // Tests that video frames are captured, transported via WebRTC, and finally
 // received in a VIDEO element.  More allowance is provided for color deviation
 // because of the additional layers of video processing performed within
 // WebRTC.
-// Disabled in MacOS: https://crbug.com/557929
-#if defined(OS_MACOSX)
-#define MAYBE_EndToEndThroughWebRTC DISABLED_EndToEndThroughWebRTC
-#else
-#define MAYBE_EndToEndThroughWebRTC EndToEndThroughWebRTC
-#endif
-IN_PROC_BROWSER_TEST_F(TabCaptureApiPixelTest, MAYBE_EndToEndThroughWebRTC) {
+IN_PROC_BROWSER_TEST_F(TabCaptureApiPixelTest, EndToEndThroughWebRTC) {
   if (IsTooIntensiveForThisPlatform()) {
     LOG(WARNING) << "Skipping this CPU-intensive test on this platform/build.";
     return;
   }
   AddExtensionToCommandLineWhitelist();
   ASSERT_TRUE(RunExtensionSubtest(
       "tab_capture", "end_to_end.html?method=webrtc&colorDeviation=50"))
       << message_;
 }
 
@@ skipping 254 matching lines @@
       return;
     }
     content::RunMessageLoop();
   }
   browser()->tab_strip_model()->RemoveObserver(&observer);
 }
 
 }  // namespace
 
 }  // namespace extensions