Merge 139419 - fix crash when double-deleting a profile

chrome/browser/resources/options2/browser_options.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.
 
 cr.define('options', function() {
   var OptionsPage = options.OptionsPage;
   var ArrayDataModel = cr.ui.ArrayDataModel;
   var RepeatingButton = cr.ui.RepeatingButton;
 
   //
@@ skipping 969 matching lines @@
      *         filePath: "/path/to/profile/data/on/disk",
      *         isCurrentProfile: false
      *       };
      * @private
      */
     setProfilesInfo_: function(profiles) {
       this.setProfileViewSingle_(profiles.length);
       // add it to the list, even if the list is hidden so we can access it
       // later.
       $('profiles-list').dataModel = new ArrayDataModel(profiles);
+      // We got new data, close the open overlay if it's open.
+      ManageProfileOverlay.getInstance().visible = false;
       this.setProfileViewButtonsStatus_();
     },
 
     setGtkThemeButtonEnabled_: function(enabled) {
       if (!cr.isChromeOS && navigator.platform.match(/linux|BSD/i))
         $('themes-GTK-button').disabled = !enabled;
     },
 
     setThemesResetButtonEnabled_: function(enabled) {
       $('themes-reset').disabled = !enabled;
@@ skipping 404 matching lines @@
     BrowserOptions.getLoggedInUsername = function() {
       return BrowserOptions.getInstance().username_;
     };
   }
 
   // Export
   return {
     BrowserOptions: BrowserOptions
   };
 });