Merge 158045 - [cros] Avatar picker: various fixes for web camera problems.

chrome/browser/resources/options/chromeos/change_picture_options.js

Index: chrome/browser/resources/options/chromeos/change_picture_options.js
===================================================================
--- chrome/browser/resources/options/chromeos/change_picture_options.js	(revision 158765)
+++ chrome/browser/resources/options/chromeos/change_picture_options.js	(working copy)
@@ -392,8 +392,9 @@
         chrome.send('selectImage', [url]);
       }
       // Start/stop camera on (de)selection.
-      if (!imageGrid.inProgramSelection) {
-        if (imageGrid.selectionType == 'camera' && !imageGrid.cameraOnline) {
+      if (!imageGrid.inProgramSelection &&
+          imageGrid.selectionType != e.oldSelectionType) {
+        if (imageGrid.selectionType == 'camera') {
             imageGrid.checkCameraPresence(
               function() {  // When present.
                 // Start capture if camera is still the selected item.
@@ -402,8 +403,7 @@
               function() {  // When absent.
                 return true;  // Check again after some time.
               });
-        } else if (imageGrid.selectionType != 'camera' &&
-                   imageGrid.cameraOnline) {
+        } else {
           imageGrid.stopCamera();
         }
       }