Renable tabCapture.ApiTests* now that fix landed in r191910.

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/stringprintf.h"
+#include "base/win/windows_version.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/extensions/feature_switch.h"
 #include "chrome/common/extensions/features/feature.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/common/content_switches.h"
 
 namespace chrome {
 
 namespace {
 
 class TabCaptureApiTest : public ExtensionApiTest {
  public:
   TabCaptureApiTest() : current_channel_(VersionInfo::CHANNEL_UNKNOWN) {}
 
  private:
   extensions::Feature::ScopedCurrentChannel current_channel_;
 };
 
 }  // namespace
 
-// Flaky. http://crbug.com/224249
-IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, DISABLED_ApiTests) {
+IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, ApiTests) {
   extensions::FeatureSwitch::ScopedOverride tab_capture(
       extensions::FeatureSwitch::tab_capture(), true);
+
+#if defined(OS_WIN)
+  // TODO(justinlin): Disabled for WinXP due to timeout issues.
+  if (base::win::GetVersion() < base::win::VERSION_VISTA) {
+    return;
+  }
+#endif
+
   ASSERT_TRUE(RunExtensionSubtest("tab_capture/experimental",
                                   "api_tests.html")) << message_;
 }
 
-// Flaky. http://crbug.com/224249
-IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, DISABLED_ApiTestsAudio) {
+IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, ApiTestsAudio) {
   extensions::FeatureSwitch::ScopedOverride tab_capture(
       extensions::FeatureSwitch::tab_capture(), true);
+
+#if defined(OS_WIN)
+  // TODO(justinlin): Disabled for WinXP due to timeout issues.
+  if (base::win::GetVersion() < base::win::VERSION_VISTA) {
+    return;
+  }
+#endif
+
   ASSERT_TRUE(RunExtensionSubtest("tab_capture/experimental",
                                   "api_tests_audio.html")) << message_;
 }
 
 // TODO(miu): Disabled until the two most-likely sources of the "flaky timeouts"
 // are resolved: 1) http://crbug.com/177163 and 2) http://crbug.com/174519.
 // See http://crbug.com/174640.
 IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, DISABLED_EndToEnd) {
   extensions::FeatureSwitch::ScopedOverride tab_capture(
       extensions::FeatureSwitch::tab_capture(), true);
@@ skipping 20 matching lines @@
   int routing_id = rvh->GetRoutingID();
 
   listener.Reply(base::StringPrintf("%i:%i", render_process_id, routing_id));
 
   ResultCatcher catcher;
   catcher.RestrictToProfile(browser()->profile());
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 }  // namespace chrome