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

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

 // Copyright 2013 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 <ctime>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/process/launch.h"
@@ skipping 76 matching lines @@
 // 5. Launch chrome and try playing a video with sound. You should see
 //    in the volume meter for the mix device. Configure the mix device to have
 //    50 / 100 in level. Also go into the playback tab, right-click Speakers,
 //    and set that level to 50 / 100. Otherwise you will get distortion in
 //    the recording.
 class WebRtcAudioQualityBrowserTest : public WebRtcTestBase,
                                       public testing::WithParamInterface<bool> {
  public:
   WebRtcAudioQualityBrowserTest() {}
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
-    test::PeerConnectionServerRunner::KillAllPeerConnectionServers();
+    PeerConnectionServerRunner::KillAllPeerConnectionServersOnCurrentSystem();
     DetectErrorsInJavaScript();  // Look for errors in our rather complex js.
   }
 
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     // This test expects real device handling and requires a real webcam / audio
     // device; it will not work with fake devices.
     EXPECT_FALSE(command_line->HasSwitch(
         switches::kUseFakeDeviceForMediaStream));
     EXPECT_FALSE(command_line->HasSwitch(
         switches::kUseFakeUIForMediaStream));
@@ skipping 22 matching lines @@
   void PlayAudioFile(content::WebContents* tab_contents) {
     EXPECT_EQ("ok-playing", ExecuteJavascript("playAudioFile()", tab_contents));
   }
 
   void EstablishCall(content::WebContents* from_tab,
                      content::WebContents* to_tab) {
     EXPECT_EQ("ok-negotiating",
               ExecuteJavascript("negotiateCall()", from_tab));
 
     // Ensure the call gets up on both sides.
-    EXPECT_TRUE(test::PollingWaitUntil("getPeerConnectionReadyState()",
-                                       "active", from_tab));
-    EXPECT_TRUE(test::PollingWaitUntil("getPeerConnectionReadyState()",
-                                       "active", to_tab));
+    EXPECT_TRUE(PollingWaitUntil("getPeerConnectionReadyState()",
+                                 "active", from_tab));
+    EXPECT_TRUE(PollingWaitUntil("getPeerConnectionReadyState()",
+                                 "active", to_tab));
   }
 
   base::FilePath CreateTemporaryWaveFile() {
     base::FilePath filename;
     EXPECT_TRUE(base::CreateTemporaryFile(&filename));
     base::FilePath wav_filename =
         filename.AddExtension(FILE_PATH_LITERAL(".wav"));
     EXPECT_TRUE(base::Move(filename, wav_filename));
     return wav_filename;
   }
 
-  test::PeerConnectionServerRunner peerconnection_server_;
+  PeerConnectionServerRunner peerconnection_server_;
 };
 
 class AudioRecorder {
  public:
   AudioRecorder(): recording_application_(base::kNullProcessHandle) {}
   ~AudioRecorder() {}
 
   // Starts the recording program for the specified duration. Returns true
   // on success.
   bool StartRecording(int duration_sec, const base::FilePath& output_file,
@@ skipping 246 matching lines @@
             ExecuteJavascript("preparePeerConnection()", left_tab));
 
   AddAudioFile(kReferenceFileRelativeUrl, left_tab);
 
   EstablishCall(left_tab, right_tab);
 
   // Note: the media flow isn't necessarily established on the connection just
   // because the ready state is ok on both sides. We sleep a bit between call
   // establishment and playing to avoid cutting of the beginning of the audio
   // file.
-  test::SleepInJavascript(left_tab, 2000);
+  SleepInJavascript(left_tab, 2000);
 
   base::FilePath recording = CreateTemporaryWaveFile();
 
   // Note: the sound clip is about 10 seconds: record for 15 seconds to get some
   // safety margins on each side.
   AudioRecorder recorder;
   static int kRecordingTimeSeconds = 15;
   ASSERT_TRUE(recorder.StartRecording(kRecordingTimeSeconds, recording, true));
 
   PlayAudioFile(left_tab);
@@ skipping 18 matching lines @@
                       &raw_mos, &mos_lqo));
 
   perf_test::PrintResult("audio_pesq", "", "raw_mos", raw_mos, "score", true);
   perf_test::PrintResult("audio_pesq", "", "mos_lqo", mos_lqo, "score", true);
 
   EXPECT_TRUE(base::DeleteFile(recording, false));
   EXPECT_TRUE(base::DeleteFile(trimmed_recording, false));
 
   ASSERT_TRUE(peerconnection_server_.Stop());
 }