Revert of Convert the WebRtcTestBase to use infobar and bubble autoresponders

chrome/test/data/webrtc/getusermedia.js

 /**
  * 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.
  */
 
 /**
  * See http://dev.w3.org/2011/webrtc/editor/getusermedia.html for more
  * information on getUserMedia.
  */
@@ skipping 21 matching lines @@
  * Used as a shortcut. Moved to the top of the page due to race conditions.
  * @param {string} id is a case-sensitive string representing the unique ID of
  *     the element being sought.
  * @return {string} id returns the element object specified as a parameter
  */
 $ = function(id) {
   return document.getElementById(id);
 };
 
 /**
- * This function asks permission to use the webcam and mic from the browser.
- * Its callbacks will return either request-callback-granted or
- * request-callback-denied depending on the outcome. If the caller does not
- * successfully resolve the request by granting or denying, the test will hang.
- * To verify which callback was called, use obtainGetUserMediaResult().
+ * This function asks permission to use the webcam and mic from the browser. It
+ * will return ok-requested to the test. This does not mean the request was
+ * approved though. The test will then have to click past the dialog that
+ * appears in Chrome, which will run either the OK or failed callback as a
+ * a result. To see which callback was called, use obtainGetUserMediaResult().
  *
  * @param {!object} constraints Defines what to be requested, with mandatory
  *     and optional constraints defined. The contents of this parameter depends
  *     on the WebRTC version.
  */
 function doGetUserMedia(constraints) {
   if (!getUserMedia) {
     returnToTest('Browser does not support WebRTC.');
     return;
   }
   debug('Requesting doGetUserMedia: constraints: ' +
         JSON.stringify(constraints, null, 0).replace(/[\r\n]/g, ''));
   getUserMedia(constraints,
                function(stream) {
                  ensureGotAllExpectedStreams_(stream, constraints);
                  getUserMediaOkCallback_(stream);
                },
                getUserMediaFailedCallback_);
+  returnToTest('ok-requested');
 }
 
 /**
  * Must be called after calling doGetUserMedia.
  * @return {string} Returns not-called-yet if we have not yet been called back
  *     by WebRTC. Otherwise it returns either ok-got-stream or
  *     failed-with-error-x (where x is the error code from the error
  *     callback) depending on which callback got called by WebRTC.
  */
 function obtainGetUserMediaResult() {
@@ skipping 73 matching lines @@
 
 /**
  * @private
  * @param {MediaStream} stream Media stream.
  */
 function getUserMediaOkCallback_(stream) {
   gLocalStream = stream;
   gRequestWebcamAndMicrophoneResult = 'ok-got-stream';
 
   attachMediaStream($('local-view'), stream);
-
-  returnToTest('request-callback-granted');
 }
 
 /**
  * @private
  * @param {NavigatorUserMediaError} error Error containing details.
  */
 function getUserMediaFailedCallback_(error) {
   // Translate from the old error to the new. Remove when rename fully deployed.
   var errorName = error.name;
 
   debug('GetUserMedia FAILED: Maybe the camera is in use by another process?');
   gRequestWebcamAndMicrophoneResult = 'failed-with-error-' + errorName;
   debug(gRequestWebcamAndMicrophoneResult);
-
-  returnToTest('request-callback-denied');
 }