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

Delete duplicated tests (they were moved to ApiTestsAudio).

BUG=224249


Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=192021

Review URL: https://chromiumcodereview.appspot.com/13464016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192973 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc

@@ -3,6 +3,7 @@
 // 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"
@@ -26,18 +27,32 @@ class TabCaptureApiTest : public ExtensionApiTest {
 
 }  // 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_;
 }

chrome/test/data/extensions/api_test/tab_capture/experimental/api_tests.js

@@ -92,43 +92,12 @@ chrome.test.runTests([
     });
   },
 
-  function onlyAudio() {
-    tabCapture.capture({audio: true}, function(stream) {
-      chrome.test.assertTrue(!!stream);
-      stream.stop();
-      chrome.test.succeed();
-    });
-  },
-
   function noAudioOrVideoRequested() {
     // If not specified, video is not requested.
     tabCapture.capture({audio: false}, function(stream) {
       chrome.test.assertTrue(!stream);
       chrome.test.succeed();
     });
-  },
-
-  function invalidAudioConstraints() {
-    var tabCaptureListener = function(info) {
-      if (info.status == 'stopped') {
-        tabCapture.onStatusChanged.removeListener(tabCaptureListener);
-
-        tabCapture.capture({audio: true, video: true}, function(stream) {
-          chrome.test.assertTrue(!!stream);
-          chrome.test.succeed();
-        });
-      }
-    };
-    tabCapture.onStatusChanged.addListener(tabCaptureListener);
-
-    tabCapture.capture({audio: true,
-                        audioConstraints: {
-                          'mandatory': {
-                            'notValid': '123'
-                          }
-                        }}, function(stream) {
-                          chrome.test.assertTrue(!stream);
-                        });
   }
 
 ]);