Set focus to the "OK" button when editing a supervised user profile

chrome/browser/ui/webui/options/manage_profile_browsertest.js

 // Copyright 2013 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.
 
 // None of these tests is relevant for Chrome OS.
 GEN('#if !defined(OS_CHROMEOS)');
 
 GEN('#include "base/command_line.h"');
 GEN('#include "chrome/common/chrome_switches.h"');
 
@@ skipping 48 matching lines @@
     // Override the BrowserOptions method to return the fake info.
     BrowserOptions.getCurrentProfile = function() {
       return this.testProfileInfo_(managed);
     }.bind(this);
     // Set the profile info in the overlay.
     ManageProfileOverlay.setProfileInfo(this.testProfileInfo_(managed),
                                         'manage');
   },
 };
 
+// Receiving the new profile defaults in the manage-user overlay shouldn't mess
+// up the focus in a visible higher-level overlay.
 TEST_F('ManageProfileUITest', 'NewProfileDefaultsFocus', function() {
   var self = this;
 
   function checkFocus(pageName, expectedFocus, initialFocus) {
     OptionsPage.showPageByName(pageName);
     initialFocus.focus();
     expectEquals(initialFocus, document.activeElement, pageName);
 
     ManageProfileOverlay.receiveNewProfileDefaults(
         self.testProfileInfo_(false));
@@ skipping 64 matching lines @@
   assertNotEquals(-1, signedInText.textContent.indexOf(custodianEmail));
 
   CreateProfileOverlay.updateSignedInStatus('');
   assertEquals('', CreateProfileOverlay.getInstance().signedInEmail_);
   assertTrue(signedInText.hidden);
   assertFalse(notSignedInText.hidden);
   assertFalse($('create-profile-managed').checked);
   assertTrue($('create-profile-managed').disabled);
 });
 
-// Managed users should not be able to edit their profile names.
+// Managed users should not be able to edit their profile names, and the initial
+// focus should be adjusted accordingly.
 TEST_F('ManageProfileUITest', 'EditManagedUserNameAllowed', function() {
   var nameField = $('manage-profile-name');
 
   this.setProfileManaged_(false);
   ManageProfileOverlay.showManageDialog();
-  assertFalse(nameField.disabled);
+  expectFalse(nameField.disabled);
+  expectEquals(nameField, document.activeElement);
+
+  OptionsPage.closeOverlay();
 
   this.setProfileManaged_(true);
   ManageProfileOverlay.showManageDialog();
-  assertTrue(nameField.disabled);
+  expectTrue(nameField.disabled);
+  expectEquals($('manage-profile-ok'), document.activeElement);
 });
 
 // Setting profile information should allow the confirmation to be shown.
 TEST_F('ManageProfileUITest', 'ShowCreateConfirmation', function() {
   var testProfile = this.testProfileInfo_(true);
   testProfile.custodianEmail = 'foo@bar.example.com';
   ManagedUserCreateConfirmOverlay.setProfileInfo(testProfile);
   assertTrue(ManagedUserCreateConfirmOverlay.getInstance().canShowPage());
   OptionsPage.showPageByName('managedUserCreateConfirm', false);
   assertEquals('managedUserCreateConfirm',
@@ skipping 235 matching lines @@
   assertEquals('settings', OptionsPage.getTopmostVisiblePage().name);
 
   ManageProfileOverlay.showDeleteDialog(this.testProfileInfo_(false));
   this.setProfileManaged_(true);
   messages = clickAndListen();
   assertEquals(0, messages.length);
   assertEquals('settings', OptionsPage.getTopmostVisiblePage().name);
 });
 
 GEN('#endif  // OS_CHROMEOS');