Relanding Switched main WebRTC browser tests to use a more realistic video

chrome/browser/media/chrome_webrtc_typing_detection_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/path_service.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/media/webrtc_browsertest_base.h"
 #include "chrome/browser/media/webrtc_browsertest_common.h"
@@ skipping 34 matching lines @@
 }
 
 // Test that the typing detection feature works.
 // You must have the src-internal solution in your .gclient to put the required
 // pyauto_private directory into chrome/test/data/.
 class WebRtcTypingDetectionBrowserTest : public WebRtcTestBase {
  public:
   // TODO(phoglund): clean up duplication from audio quality browser test when
   // this test is complete and is proven to work.
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
-    PeerConnectionServerRunner::KillAllPeerConnectionServersOnCurrentSystem();
+    test::PeerConnectionServerRunner::KillAllPeerConnectionServers();
   }
 
   bool HasAllRequiredResources() {
     base::FilePath reference_file =
         GetTestDataDir().Append(kReferenceFile);
     if (!base::PathExists(reference_file)) {
       LOG(ERROR) << "Cannot find the reference file to be used for audio "
                  << "quality comparison: " << reference_file.value();
       return false;
     }
@@ skipping 15 matching lines @@
     EXPECT_EQ("ok-mixed-in", ExecuteJavascript(
         "mixLocalStreamWithPreviouslyLoadedAudioFile()", 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(PollingWaitUntil("getPeerConnectionReadyState()",
-                                 "active", from_tab));
-    EXPECT_TRUE(PollingWaitUntil("getPeerConnectionReadyState()",
-                                 "active", to_tab));
+    EXPECT_TRUE(test::PollingWaitUntil("getPeerConnectionReadyState()",
+                                       "active", from_tab));
+    EXPECT_TRUE(test::PollingWaitUntil("getPeerConnectionReadyState()",
+                                       "active", to_tab));
   }
 
-  PeerConnectionServerRunner peerconnection_server_;
+  test::PeerConnectionServerRunner peerconnection_server_;
 };
 
 // TODO(phoglund): enable when fully implemented.
 IN_PROC_BROWSER_TEST_F(WebRtcTypingDetectionBrowserTest,
                        DISABLED_MANUAL_TestTypingDetection) {
   // TODO(phoglund): make this use embedded_test_server when that test server
   // can handle files > ~400Kb.
   ASSERT_TRUE(test_server()->Start());
   ASSERT_TRUE(peerconnection_server_.Start());
 
@@ skipping 18 matching lines @@
 
   AddAudioFile(kReferenceFileRelativeUrl, left_tab);
   MixLocalStreamWithPreviouslyLoadedAudioFile(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.
-  SleepInJavascript(left_tab, 2000);
+  test::SleepInJavascript(left_tab, 2000);
 
   PlayAudioFile(left_tab);
 
   // TODO(phoglund): simulate key presses, look for changes in typing detection
   // state.
-  SleepInJavascript(left_tab, 10000);
+  test::SleepInJavascript(left_tab, 10000);
 
   HangUp(left_tab);
   WaitUntilHangupVerified(left_tab);
   WaitUntilHangupVerified(right_tab);
 
   ASSERT_TRUE(peerconnection_server_.Stop());
 }