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

trunk/src/chrome/browser/media/chrome_webrtc_apprtc_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/path_service.h"
 #include "base/process/launch.h"
 #include "base/rand_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/win/windows_version.h"
@@ skipping 101 matching lines @@
                                                 &result))
       return false;
 
     return result == kTitlePageOfAppEngineAdminPage;
   }
 
   bool WaitForCallToComeUp(content::WebContents* tab_contents) {
     // Apprtc will set remoteVideo.style.opacity to 1 when the call comes up.
     std::string javascript =
         "window.domAutomationController.send(remoteVideo.style.opacity)";
-    return test::PollingWaitUntil(javascript, "1", tab_contents);
+    return PollingWaitUntil(javascript, "1", tab_contents);
   }
 
   bool EvalInJavascriptFile(content::WebContents* tab_contents,
                             const base::FilePath& path) {
     std::string javascript;
     if (!ReadFileToString(path, &javascript)) {
       LOG(ERROR) << "Missing javascript code at " << path.value() << ".";
       return false;
     }
 
@@ skipping 108 matching lines @@
                                           base::RandInt(0, 65536)));
   content::WebContents* chrome_tab = OpenPageAndAcceptUserMedia(room_url);
 
   ASSERT_TRUE(LaunchFirefoxWithUrl(room_url));
 
   ASSERT_TRUE(WaitForCallToComeUp(chrome_tab));
 
   // Ensure Firefox manages to send video our way.
   ASSERT_TRUE(DetectRemoteVideoPlaying(chrome_tab));
 }