Renamed erronous element id refresh_devices to get_devices

chrome/test/data/webrtc/manual/peerconnection_manual.js

 /**
  * Copyright 2014 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. See
  * http://dev.w3.org/2011/webrtc/editor/webrtc.html for more information on
@@ skipping 191 matching lines @@
  * capturing.
  */
 function updateGetUserMediaConstraints() {
   var audioSelected = $('audiosrc');
   var videoSelected = $('videosrc');
   var constraints = {
     audio: $('audio').checked,
     video: $('video').checked
   };
 
+  if ($('video').checked == true) {

[phoglund_chromium, 2014/06/19 10:06:59]

Drop the == true (apply throughout)

[jansson, 2014/06/19 11:45:49]

Done.

+    // Default optional constraints placed here.
+    constraints.video = {optional: [{minWidth: $('video-width').value},
+                                    {minHeight: $('video-height').value},
+                                    {googLeakyBucket: true}]};
+  }
+
   if (audioSelected.disabled == false && videoSelected.disabled == false) {

[phoglund_chromium, 2014/06/19 10:06:59]

if (!audioSelected.disabled && !videoSelected) {

[jansson, 2014/06/19 11:45:49]

Done.

     var devices = getSourcesFromField_(audioSelected, videoSelected);
+
     if ($('audio').checked == true) {

[phoglund_chromium, 2014/06/19 10:06:59]

Umm, what is audioSelected and videoSelected anyway? Is that the device chosen
by the user in the drop-down list? In that case name it selectedAudioDevice
(audioSelected sounds like the user selected audio which is confusing compared
to $('audio').checked).

[jansson, 2014/06/19 11:45:49]

Yes you are correct, Fixed it for both getDevices() and
updateGetUserMediaConstraints() as well as some comments.

-      if (devices.audioId != null) {
+      if (devices.audioId != null)
         constraints.audio = {optional: [{sourceId: devices.audioId}]};
-      } else {
-        constraints.audio = true;
-      }
     }
+
     if ($('video').checked == true) {
-      // Default optional constraints placed here.
-      constraints.video = {optional: [{minWidth: $('video-width').value},
-                                      {minHeight: $('video-height').value},
-                                      {googLeakyBucket: true}]
-      };
-      if (devices.videoId != null) {
+      if (devices.videoId != null)
         constraints.video.optional.push({sourceId: devices.videoId});
-      }
     }
   }
 
   if ($('screencapture').checked) {
     var constraints = {
       audio: $('audio').checked,
       video: {mandatory: {chromeMediaSource: 'screen',
                           maxWidth: screen.width,
                           maxHeight: screen.height}}
     };
     if ($('audio').checked == true)
       print_('Audio for screencapture is not implemented yet, please ' +
             'try to set audio = false prior requesting screencapture');
   }
+
   $('getusermedia-constraints').value = JSON.stringify(constraints, null, ' ');
 }
 
 function showServerHelp() {
   alert('You need to build and run a peerconnection_server on some ' +
         'suitable machine. To build it in chrome, just run make/ninja ' +
         'peerconnection_server. Otherwise, read in https://code.google' +
         '.com/searchframe#xSWYf0NTG_Q/trunk/peerconnection/README&q=REA' +
         'DME%20package:webrtc%5C.googlecode%5C.com.');
 }
@@ skipping 60 matching lines @@
   var audio_select = $('audiosrc');
   var video_select = $('videosrc');
   var get_devices = $('get-devices');
   audio_select.innerHTML = '';
   video_select.innerHTML = '';
   try {
     eval(MediaStreamTrack.getSources(function() {}));
   } catch (exception) {
     audio_select.disabled = true;
     video_select.disabled = true;
-    refresh_devices.disabled = true;
+    get_devices.disabled = true;
     updateGetUserMediaConstraints();
     error_('Device enumeration not supported. ' + exception);
   }
   MediaStreamTrack.getSources(function(devices) {
     for (var i = 0; i < devices.length; i++) {
       var option = document.createElement('option');
       option.value = devices[i].id;
       option.text = devices[i].label;
       if (devices[i].kind == 'audio') {
         if (option.text == '') {
@@ skipping 1044 matching lines @@
 
 /** @private */
 function readResponseHeader_(request, key) {
   var value = request.getResponseHeader(key);
   if (value == null || value.length == 0) {
     error_('Received empty value ' + value +
            ' for response header key ' + key + '.');
   }
   return parseInt(value);
 }