MD Settings People: Fix ChromeOS Change Picture selected image bug

chrome/test/data/webui/settings/people_page_change_picture_test.js

 // Copyright 2015 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.
 
 cr.define('settings_people_page_change_picture', function() {
   /**
    * @constructor
    * @implements {settings.ChangePictureBrowserProxy}
    * @extends {settings.TestBrowserProxy}
    */
@@ skipping 67 matching lines @@
     },
   };
 
   function registerChangePictureTests() {
     suite('ChangePictureTests', function() {
       var changePicture = null;
       var browserProxy = null;
       var settingsCamera = null;
       var discardControlBar = null;
 
-      function getSelectedItem() {
-        return changePicture.$$('#selector .iron-selected');
-      }
-
       suiteSetup(function() {
         loadTimeData.overrideValues({
           profilePhoto: 'Fake Profile Photo description',
         });
       });
 
       setup(function() {
         browserProxy = new TestChangePictureBrowserProxy();
         settings.ChangePictureBrowserProxyImpl.instance_ = browserProxy;
         PolymerTest.clearBody();
@@ skipping 30 matching lines @@
 
         expectFalse(cameraIcon.hidden);
         expectFalse(settingsCamera.cameraActive);
 
         MockInteractions.tap(cameraIcon);
 
         Polymer.dom.flush();
         expectFalse(cameraIcon.hidden);
         expectTrue(settingsCamera.cameraActive);
         expectEquals(ChangePictureSelectionTypes.CAMERA,
-                     getSelectedItem().dataset.type);
+                     changePicture.selectedItem_.dataset.type);
         expectTrue(discardControlBar.hidden);
 
         // Ensure that the camera is deactivated if user navigates away.
         changePicture.currentRouteChanged(settings.Route.BASIC);
         expectFalse(settingsCamera.cameraActive);
       });
 
       test('ChangePictureProfileImage', function() {
         var profileImage = changePicture.$.profileImage;
         assertTrue(!!profileImage);
 
-        expectEquals(null, getSelectedItem());
+        expectEquals(undefined, changePicture.selectedItem_);
         MockInteractions.tap(profileImage);
 
         return browserProxy.whenCalled('selectProfileImage').then(function() {
           Polymer.dom.flush();
 
           expectEquals(ChangePictureSelectionTypes.PROFILE,
-                       getSelectedItem().dataset.type);
+                       changePicture.selectedItem_.dataset.type);
           expectFalse(settingsCamera.cameraActive);
           expectTrue(discardControlBar.hidden);
+
+          // Ensure that the selection is restored after navigating away and
+          // then back to the subpage.
+          changePicture.currentRouteChanged(settings.Route.BASIC);
+          changePicture.currentRouteChanged(settings.Route.CHANGE_PICTURE);
+          expectEquals(ChangePictureSelectionTypes.PROFILE,
+                       changePicture.selectedItem_.dataset.type);
         });
       });
 
       test('ChangePictureOldImage', function() {
         // By default there is no old image and the element is hidden.
         var oldImage = changePicture.$.oldImage;
         assertTrue(!!oldImage);
         assertTrue(oldImage.hidden);
 
         cr.webUIListenerCallback('old-image-changed', 'fake-old-image.jpg');
         Polymer.dom.flush();
 
         // Expect the old image to be selected once an old image is sent via
         // the native interface.
         expectEquals(ChangePictureSelectionTypes.OLD,
-                     getSelectedItem().dataset.type);
+                     changePicture.selectedItem_.dataset.type);
         expectFalse(oldImage.hidden);
         expectFalse(settingsCamera.cameraActive);
         expectFalse(discardControlBar.hidden);
       });
 
       test('ChangePictureSelectFirstDefaultImage', function() {
         var firstDefaultImage = changePicture.$$('img[data-type="default"]');
         assertTrue(!!firstDefaultImage);
 
         MockInteractions.tap(firstDefaultImage);
 
         return browserProxy.whenCalled('selectDefaultImage').then(
             function(args) {
               expectEquals('chrome://foo/1.png', args[0]);
 
               Polymer.dom.flush();
               expectEquals(ChangePictureSelectionTypes.DEFAULT,
-                           getSelectedItem().dataset.type);
-              expectEquals(firstDefaultImage, getSelectedItem());
+                           changePicture.selectedItem_.dataset.type);
+              expectEquals(firstDefaultImage, changePicture.selectedItem_);
               expectFalse(settingsCamera.cameraActive);
               expectTrue(discardControlBar.hidden);
             });
       });
 
       test('ChangePictureRestoreImageAfterDiscard', function() {
         var firstDefaultImage = changePicture.$$('img[data-type="default"]');
         assertTrue(!!firstDefaultImage);
         var discardOldImage = changePicture.$.discardOldImage;
         assertTrue(!!discardOldImage);
 
         MockInteractions.tap(firstDefaultImage);
 
         return browserProxy.whenCalled('selectDefaultImage').then(function() {
           Polymer.dom.flush();
-          expectEquals(firstDefaultImage, getSelectedItem());
+          expectEquals(firstDefaultImage, changePicture.selectedItem_);
 
           cr.webUIListenerCallback('old-image-changed', 'fake-old-image.jpg');
 
           Polymer.dom.flush();
           expectEquals(ChangePictureSelectionTypes.OLD,
-                       getSelectedItem().dataset.type);
+                       changePicture.selectedItem_.dataset.type);
 
           MockInteractions.tap(discardOldImage);
 
           Polymer.dom.flush();
-          expectEquals(firstDefaultImage, getSelectedItem());
+          expectEquals(firstDefaultImage, changePicture.selectedItem_);
         });
       });
     });
   }
 
   return {
     registerTests: function() {
       registerChangePictureTests();
     },
   };
 });