Revert 260213 "Relanding Switched main WebRTC browser tests to u..."

trunk/src/chrome/browser/media/chrome_webrtc_browsertest.cc

Index: trunk/src/chrome/browser/media/chrome_webrtc_browsertest.cc
===================================================================
--- trunk/src/chrome/browser/media/chrome_webrtc_browsertest.cc	(revision 260283)
+++ trunk/src/chrome/browser/media/chrome_webrtc_browsertest.cc	(working copy)
@@ -32,24 +32,18 @@
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "testing/perf/perf_test.h"
 
-// For fine-grained suppression.
-#if defined(OS_WIN)
-#include "base/win/windows_version.h"
-#endif
-
 static const char kMainWebrtcTestHtmlPage[] =
     "/webrtc/webrtc_jsep01_test.html";
 
 // Top-level integration test for WebRTC. The test methods here must run
 // sequentially since they use a server binary on the system (hence they are
-// tagged as MANUAL). In addition, they need the reference videos which require
-// the webrtc.DEPS solution, which is not generally available on Chromium bots.
+// tagged as MANUAL).
 class WebRtcBrowserTest : public WebRtcTestBase,
                           public testing::WithParamInterface<bool> {
  public:
   WebRtcBrowserTest() {}
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
-    test::PeerConnectionServerRunner::KillAllPeerConnectionServers();
+    PeerConnectionServerRunner::KillAllPeerConnectionServersOnCurrentSystem();
     DetectErrorsInJavaScript();  // Look for errors in our rather complex js.
   }
 
@@ -57,12 +51,8 @@
     // Ensure the infobar is enabled, since we expect that in this test.
     EXPECT_FALSE(command_line->HasSwitch(switches::kUseFakeUIForMediaStream));
 
-    // Play a suitable, somewhat realistic video file.
-    base::FilePath input_video = test::GetReferenceVideosDir()
-        .Append(test::kReferenceFileName360p)
-        .AddExtension(test::kY4mFileExtension);
-    command_line->AppendSwitchPath(switches::kUseFileForFakeVideoCapture,
-                                   input_video);
+    // TODO(phoglund): allow this test to also run with real devices once we
+    // get real webcam bots up.
     command_line->AppendSwitch(switches::kUseFakeDeviceForMediaStream);
 
     // Flag used by TestWebAudioMediaStream to force garbage collection.
@@ -123,15 +113,7 @@
     return NULL;
   }
 
-  bool OnWinXp() {
-#if defined(OS_WIN)
-    return base::win::GetVersion() <= base::win::VERSION_XP;
-#else
-    return false;
-#endif
-  }
-
-  test::PeerConnectionServerRunner peerconnection_server_;
+  PeerConnectionServerRunner peerconnection_server_;
 };
 
 static const bool kRunTestsWithFlag[] = { false, true };
@@ -141,9 +123,6 @@
 
 IN_PROC_BROWSER_TEST_P(WebRtcBrowserTest,
                        MANUAL_RunsAudioVideoWebRTCCallInTwoTabs) {
-  if (OnWinXp()) return;
-
-  ASSERT_TRUE(test::HasReferenceFilesInCheckout());
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
   ASSERT_TRUE(peerconnection_server_.Start());
 
@@ -168,9 +147,6 @@
 }
 
 IN_PROC_BROWSER_TEST_P(WebRtcBrowserTest, MANUAL_CpuUsage15Seconds) {
-  if (OnWinXp()) return;
-
-  ASSERT_TRUE(test::HasReferenceFilesInCheckout());
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
   ASSERT_TRUE(peerconnection_server_.Start());
 
@@ -206,7 +182,7 @@
 
   EstablishCall(left_tab, right_tab);
 
-  test::SleepInJavascript(left_tab, 15000);
+  SleepInJavascript(left_tab, 15000);
 
   HangUp(left_tab);
   WaitUntilHangupVerified(left_tab);
@@ -223,9 +199,6 @@
 // This is manual for its long execution time.
 IN_PROC_BROWSER_TEST_P(WebRtcBrowserTest,
                        MANUAL_RunsAudioVideoCall60SecsAndLogsInternalMetrics) {
-  if (OnWinXp()) return;
-
-  ASSERT_TRUE(test::HasReferenceFilesInCheckout());
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
   ASSERT_TRUE(peerconnection_server_.Start());
 
@@ -247,7 +220,7 @@
   WaitForVideoToPlay(right_tab);
 
   // Let values stabilize, bandwidth ramp up, etc.
-  test::SleepInJavascript(left_tab, 60000);
+  SleepInJavascript(left_tab, 60000);
 
   // Start measurements.
   chrome::AddTabAt(browser(), GURL(), -1, true);
@@ -255,7 +228,7 @@
   content::WebContents* webrtc_internals_tab =
       browser()->tab_strip_model()->GetActiveWebContents();
 
-  test::SleepInJavascript(left_tab, 10000);
+  SleepInJavascript(left_tab, 10000);
 
   scoped_ptr<base::DictionaryValue> all_data(
       GetWebrtcInternalsData(webrtc_internals_tab));
@@ -264,8 +237,8 @@
   const base::DictionaryValue* first_pc_dict =
       GetDataOnFirstPeerConnection(all_data.get());
   ASSERT_TRUE(first_pc_dict != NULL);
-  test::PrintBweForVideoMetrics(*first_pc_dict);
-  test::PrintMetricsForAllStreams(*first_pc_dict);
+  PrintBweForVideoMetrics(*first_pc_dict);
+  PrintMetricsForAllStreams(*first_pc_dict);
 
   HangUp(left_tab);
   WaitUntilHangupVerified(left_tab);
@@ -274,10 +247,7 @@
   ASSERT_TRUE(peerconnection_server_.Stop());
 }
 
-IN_PROC_BROWSER_TEST_P(WebRtcBrowserTest, MANUAL_TestWebAudioMediaStream) {
-  if (OnWinXp()) return;
-
-  ASSERT_TRUE(test::HasReferenceFilesInCheckout());
+IN_PROC_BROWSER_TEST_P(WebRtcBrowserTest, TestWebAudioMediaStream) {
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
   GURL url(embedded_test_server()->GetURL("/webrtc/webaudio_crash.html"));
   ui_test_utils::NavigateToURL(browser(), url);
@@ -285,7 +255,7 @@
       browser()->tab_strip_model()->GetActiveWebContents();
 
   // A sleep is necessary to be able to detect the crash.
-  test::SleepInJavascript(tab, 1000);
+  SleepInJavascript(tab, 1000);
 
   ASSERT_FALSE(tab->IsCrashed());
 }