Updated Chrome Test pages to use adapter.js

content/browser/media/webrtc_browsertest.cc

 // Copyright (c) 2012 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/strings/utf_string_conversions.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/shell/shell.h"
@@ skipping 34 matching lines @@
     EXPECT_EQ(expected_title16, title_watcher.WaitAndGetTitle());
   }
 };
 
 // These tests will all make a getUserMedia call with different constraints and
 // see that the success callback is called. If the error callback is called or
 // none of the callbacks are called the tests will simply time out and fail.
 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, GetVideoStreamAndStop) {
   GURL url(embedded_test_server()->GetURL("/media/getusermedia.html"));
   NavigateToURL(shell(), url);
 

[phoglund_chromium, 2013/07/29 11:27:55]

Sorry, you should not be changing anything here since this calls to
getusermedia.html and not getusermedia.js (this is a content browser test, which
uses different HTML files than the ones you have been modifying). Just roll back
the changes in this file.

-  EXPECT_TRUE(ExecuteJavascript("getUserMedia({video: true});"));
+  EXPECT_TRUE(ExecuteJavascript("doGetUserMedia({video: true});"));
 
   ExpectTitle("OK");
 }
 
 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, GetAudioAndVideoStreamAndStop) {
   GURL url(embedded_test_server()->GetURL("/media/getusermedia.html"));
   NavigateToURL(shell(), url);
 
-  EXPECT_TRUE(ExecuteJavascript("getUserMedia({video: true, audio: true});"));
+  EXPECT_TRUE(ExecuteJavascript("doGetUserMedia({video: true, audio: true});"));
 
   ExpectTitle("OK");
 }
 
 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, GetAudioAndVideoStreamAndClone) {
   GURL url(embedded_test_server()->GetURL("/media/getusermedia.html"));
   NavigateToURL(shell(), url);
 
-  EXPECT_TRUE(ExecuteJavascript("getUserMediaAndClone();"));
+  EXPECT_TRUE(ExecuteJavascript("doGetUserMediaAndClone();"));
 
   ExpectTitle("OK");
 }
 
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY)
 // Timing out on ARM linux bot: http://crbug.com/238490
 #define MAYBE_CanSetupVideoCall DISABLED_CanSetupVideoCall
 #else
 #define MAYBE_CanSetupVideoCall CanSetupVideoCall
@@ skipping 139 matching lines @@
 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MANUAL_CallAndModifyStream) {
   GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
   NavigateToURL(shell(), url);
 
   EXPECT_TRUE(
       ExecuteJavascript("callWithNewVideoMediaStreamLaterSwitchToAudio();"));
   ExpectTitle("OK");
 }
 
 }  // namespace content