Revert 217770 "Landing https://codereview.chromium.org/18769010/."

trunk/src/chrome/test/functional/webrtc_test_base.py

 #!/usr/bin/env python
 # 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.
 
 import os
 import platform
 import re
 import subprocess
 
@@ skipping 33 matching lines @@
           'dismiss'.
       request_video: Whether to request video.
       request_audio: Whether to request audio.
 
     Returns:
       A string as specified by the getUserMedia javascript function.
     """
     constraints = '{ video: %s, audio: %s }' % (str(request_video).lower(),
                                                 str(request_audio).lower())
     self.assertEquals('ok-requested', self.ExecuteJavascript(
-        'doGetUserMedia("%s")' % constraints, tab_index=tab_index))
+        'getUserMedia("%s")' % constraints, tab_index=tab_index))
 
     self.WaitForInfobarCount(1, tab_index=tab_index)
     self.PerformActionOnInfobar(action, infobar_index=0, tab_index=tab_index)
     self.WaitForGetUserMediaResult(tab_index=0)
 
     result = self.GetUserMediaResult(tab_index=0)
     self.AssertNoFailures(tab_index)
     return result
 
   def WaitForGetUserMediaResult(self, tab_index):
@@ skipping 141 matching lines @@
         'Could not locate peerconnection_server. Have you built the '
         'peerconnection_server target? We expect to have a '
         'peerconnection_server binary next to the chrome binary.')
 
     self._server_process = subprocess.Popen(binary_path)
 
   def StopPeerConnectionServer(self):
     """Stops the peerconnection_server."""
     assert self._server_process
     self._server_process.kill()