Working around the page load problem on Linux, re-enable tests.

chrome/browser/media/webrtc_browsertest_base.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 "chrome/browser/media/webrtc_browsertest_base.h"
 
 #include "base/lazy_instance.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/media/media_stream_infobar_delegate.h"
 #include "chrome/browser/media/webrtc_browsertest_common.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/browser_test_utils.h"
 
 const char WebRtcTestBase::kAudioVideoCallConstraints[] =
     "'{audio: true, video: true}'";
 const char WebRtcTestBase::kAudioOnlyCallConstraints[] = "'{audio: true}'";
 const char WebRtcTestBase::kVideoOnlyCallConstraints[] = "'{video: true}'";
 const char WebRtcTestBase::kFailedWithPermissionDeniedError[] =
@@ skipping 85 matching lines @@
   infobar->delegate()->InfoBarDismissed();
   CloseInfoBarInTab(tab_contents, infobar);
 
   // A dismiss should be treated like a deny.
   EXPECT_TRUE(PollingWaitUntil("obtainGetUserMediaResult()",
                                kFailedWithPermissionDeniedError, tab_contents));
 }
 
 void WebRtcTestBase::GetUserMedia(content::WebContents* tab_contents,
                                   const std::string& constraints) const {
-  // TODO(phoglund): temporary debugging measure for crbug.com/281268.
-  std::string javascript =
-      "if (typeof(doGetUserMedia) != typeof(Function)) {\n"
-      "  console.log('hitting weird js load bug: diagnosing...');\n"
-      "  for (var v in window) {\n"
-      "    if (window.hasOwnProperty(v)) console.log(v);\n"
-      "  }\n"
-      "  window.domAutomationController.send('failed!');\n"
-      "}\n"
-      "else\n"
-      "  doGetUserMedia(" + constraints + ");";
   // Request user media: this will launch the media stream info bar.
   std::string result;
   EXPECT_TRUE(content::ExecuteScriptAndExtractString(
-      tab_contents, javascript, &result));
+      tab_contents, "doGetUserMedia(" + constraints + ");", &result));
   EXPECT_EQ("ok-requested", result);
 }
 
 InfoBar* WebRtcTestBase::GetUserMediaAndWaitForInfoBar(
     content::WebContents* tab_contents,
     const std::string& constraints) const {
   content::WindowedNotificationObserver infobar_added(
       chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED,
       content::NotificationService::AllSources());
 
   // Request user media: this will launch the media stream info bar.
   GetUserMedia(tab_contents, constraints);
 
   // Wait for the bar to pop up, then return it.
   infobar_added.Wait();
   content::Details<InfoBar::AddedDetails> details(infobar_added.details());
   EXPECT_TRUE(details->delegate()->AsMediaStreamInfoBarDelegate());
   return details.ptr();
 }
 
+content::WebContents* WebRtcTestBase::OpenPageAndGetUserMediaInNewTab(
+      const GURL& url) const {
+  chrome::AddTabAt(browser(), GURL(), -1, true);
+  ui_test_utils::NavigateToURL(browser(), url);
+#if defined (OS_LINUX)
+  // Load the page again on Linux to work around crbug.com/281268.
+  ui_test_utils::NavigateToURL(browser(), url);
+#endif
+  content::WebContents* new_tab =
+      browser()->tab_strip_model()->GetActiveWebContents();
+  GetUserMediaAndAccept(new_tab);
+  return new_tab;
+}
+
 content::WebContents* WebRtcTestBase::OpenPageAndAcceptUserMedia(
     const GURL& url) const {
   content::WindowedNotificationObserver infobar_added(
       chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED,
       content::NotificationService::AllSources());
 
   ui_test_utils::NavigateToURL(browser(), url);
 
   infobar_added.Wait();
 
@@ skipping 40 matching lines @@
     content::WebContents* tab_contents) const {
   std::string javascript = base::StringPrintf(
       "connect('http://localhost:%s', '%s');",
       PeerConnectionServerRunner::kDefaultPort, peer_name.c_str());
   EXPECT_EQ("ok-connected", ExecuteJavascript(javascript, tab_contents));
 }
 
 void WebRtcTestBase::DetectErrorsInJavaScript() {
   detect_errors_in_javascript_ = true;
 }