Backed out changeset e2bba39c0385 (bug 995777) for Android 4.0 robocop-2 perma-fail.

mobile/android/chrome/content/WebrtcUI.js

@@ -197,8 +197,8 @@ var WebrtcUI = {
     if (videoDevices.length > 1 || audioDevices.length > 0) {
       // Only show the No Video option if there are also Audio devices to choose from
       if (audioDevices.length > 0)
-        extraItems = [ Strings.browser.GetStringFromName("getUserMedia.videoSource.none") ];
-      this._addDevicesToOptions(videoDevices, "videoSource", options, extraItems);
+        extraItems = [ Strings.browser.GetStringFromName("getUserMedia.videoDevice.none") ];
+      this._addDevicesToOptions(videoDevices, "videoDevice", options, extraItems);
     }
 
     if (audioDevices.length > 1 || videoDevices.length > 0) {

mobile/android/locales/en-US/chrome/browser.properties

@@ -299,12 +299,12 @@ getUserMedia.shareMicrophone.message = Would you like to share your microphone w
 getUserMedia.shareCameraAndMicrophone.message = Would you like to share your camera and microphone with %S?
 getUserMedia.denyRequest.label = Don't Share
 getUserMedia.shareRequest.label = Share
-getUserMedia.videoSource.default = Camera %S
-getUserMedia.videoSource.frontCamera = Front facing camera
-getUserMedia.videoSource.backCamera = Back facing camera
-getUserMedia.videoSource.none = No Video
-getUserMedia.videoSource.tabShare = Choose a tab to stream
-getUserMedia.videoSource.prompt = Video source
+getUserMedia.videoDevice.default = Camera %S
+getUserMedia.videoDevice.frontCamera = Front facing camera
+getUserMedia.videoDevice.backCamera = Back facing camera
+getUserMedia.videoDevice.none = No Video
+getUserMedia.videoDevice.tabShare = Choose a tab to stream
+getUserMedia.videoDevice.prompt = Video source
 getUserMedia.audioDevice.default = Microphone %S
 getUserMedia.audioDevice.none = No Audio
 getUserMedia.audioDevice.prompt = Microphone to use