Rewrote WebRTC browser tests to not use peerconnection_server.

chrome/browser/media/chrome_webrtc_video_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 "base/command_line.h"
 #include "base/environment.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/process/launch.h"
 #include "base/strings/string_split.h"
@@ skipping 88 matching lines @@
 // comparison.
 //
 // You must also compile the chromium_builder_webrtc target before you run this
 // test to get all the tools built.
 //
 // The external compare_videos.py script also depends on two external
 // executables which must be located in the PATH when running this test.
 // * zxing (see the CPP version at https://code.google.com/p/zxing)
 // * ffmpeg 0.11.1 or compatible version (see http://www.ffmpeg.org)
 //
-// The test case will launch a custom binary (peerconnection_server) which will
-// allow two WebRTC clients to find each other.
-//
-// The test also runs several other custom binaries - rgba_to_i420 converter and
+// The test runs several custom binaries - rgba_to_i420 converter and
 // frame_analyzer. Both tools can be found under third_party/webrtc/tools. The
 // test also runs a stand alone Python implementation of a WebSocket server
 // (pywebsocket) and a barcode_decoder script.
 class WebRtcVideoQualityBrowserTest : public WebRtcTestBase,
     public testing::WithParamInterface<VideoQualityTestConfig> {
  public:
   WebRtcVideoQualityBrowserTest()
       : pywebsocket_server_(0),
         environment_(base::Environment::Create()) {
     test_config_ = GetParam();
   }
 
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
-    test::PeerConnectionServerRunner::KillAllPeerConnectionServers();
     DetectErrorsInJavaScript();  // Look for errors in our rather complex js.
   }
 
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     // Set up the command line option with the expected file name. We will check
     // its existence in HasAllRequiredResources().
     webrtc_reference_video_y4m_ = test::GetReferenceFilesDir()
         .Append(test_config_.reference_video)
         .AddExtension(test::kY4mFileExtension);
     command_line->AppendSwitchPath(switches::kUseFileForFakeVideoCapture,
@@ skipping 154 matching lines @@
 
   base::FilePath GetWorkingDir() {
     std::string home_dir;
     environment_->GetVar(kHomeEnvName, &home_dir);
     base::FilePath::StringType native_home_dir(home_dir.begin(),
                                                home_dir.end());
     return base::FilePath(native_home_dir).Append(kWorkingDirName);
   }
 
  protected:
-  test::PeerConnectionServerRunner peerconnection_server_;
   VideoQualityTestConfig test_config_;
 
  private:
   base::FilePath GetSourceDir() {
     base::FilePath source_dir;
     PathService::Get(base::DIR_SOURCE_ROOT, &source_dir);
     return source_dir;
   }
 
   base::FilePath GetBrowserDir() {
@@ skipping 20 matching lines @@
   if (base::win::GetVersion() <= base::win::VERSION_XP)
     return;
 #endif
 
   ASSERT_GE(TestTimeouts::action_max_timeout().InSeconds(), 150) <<
       "This is a long-running test; you must specify "
       "--ui-test-action-max-timeout to have a value of at least 150000.";
   ASSERT_TRUE(HasAllRequiredResources());
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
   ASSERT_TRUE(StartPyWebSocketServer());
-  ASSERT_TRUE(peerconnection_server_.Start());
 
   content::WebContents* left_tab =
       OpenPageAndGetUserMediaInNewTabWithConstraints(
           embedded_test_server()->GetURL(kMainWebrtcTestHtmlPage),
           test_config_.constraints);
   content::WebContents* right_tab =
       OpenPageAndGetUserMediaInNewTabWithConstraints(
           embedded_test_server()->GetURL(test_config_.capture_page),
           test_config_.constraints);
 
-  EstablishCall(left_tab, right_tab);
+  SetupPeerconnectionWithLocalStream(left_tab);
+  SetupPeerconnectionWithLocalStream(right_tab);
+
+  NegotiateCall(left_tab, right_tab);
 
   // Poll slower here to avoid flooding the log with messages: capturing and
   // sending frames take quite a bit of time.
   int polling_interval_msec = 1000;
 
   EXPECT_TRUE(test::PollingWaitUntil(
       "doneFrameCapturing()", "done-capturing", right_tab,
       polling_interval_msec));
 
   HangUp(left_tab);
-  WaitUntilHangupVerified(left_tab);
-  WaitUntilHangupVerified(right_tab);
 
   EXPECT_TRUE(test::PollingWaitUntil(
       "haveMoreFramesToSend()", "no-more-frames", right_tab,
       polling_interval_msec));
 
   // Shut everything down to avoid having the javascript race with the analysis
   // tools. For instance, dont have console log printouts interleave with the
   // RESULT lines from the analysis tools (crbug.com/323200).
-  ASSERT_TRUE(peerconnection_server_.Stop());
   ASSERT_TRUE(ShutdownPyWebSocketServer());
 
   chrome::CloseWebContents(browser(), left_tab, false);
   chrome::CloseWebContents(browser(), right_tab, false);
 
   RunARGBtoI420Converter(
       test_config_.width, test_config_.height,
       GetWorkingDir().Append(kCapturedYuvFileName));
   ASSERT_TRUE(CompareVideosAndPrintResult(
       test_config_.test_name,
       test_config_.width,
       test_config_.height,
       GetWorkingDir().Append(kCapturedYuvFileName),
       test::GetReferenceFilesDir()
           .Append(test_config_.reference_video)
           .AddExtension(test::kYuvFileExtension),
       GetWorkingDir().Append(kStatsFileName)));
 }