Allow supervised users to delete profiles in about:settings.

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)');
 
 /**
  * TestFixture for ManageProfileOverlay and CreateProfileOverlay WebUI testing.
  * @extends {testing.Test}
@@ skipping 483 matching lines @@
 
   // A no-op update to the sign-in status should not change the UI.
   CreateProfileOverlay.updateSignedInStatus(custodianEmail);
   CreateProfileOverlay.updateSupervisedUsersAllowed(true);
   assertTrue(checkbox.disabled, 'creation in progress');
 
   CreateProfileOverlay.updateCreateInProgress(false);
   assertFalse(checkbox.disabled, 'creation finished');
 });
 
-// Supervised users shouldn't be able to open the delete or create dialogs.
-TEST_F('ManageProfileUITest', 'SupervisedShowDeleteAndCreate', function() {
+// Supervised users should be able to open the delete dialog, but not the
+// create dialog.
+TEST_F('ManageProfileUITest', 'SupervisedShowCreate', function() {
   this.setProfileSupervised_(false, 'create');
 
   ManageProfileOverlay.showCreateDialog();
   assertEquals('createProfile', PageManager.getTopmostVisiblePage().name);
   PageManager.closeOverlay();
   assertEquals('settings', PageManager.getTopmostVisiblePage().name);
   ManageProfileOverlay.showDeleteDialog(this.testProfileInfo_(false));
   assertEquals('manageProfile', PageManager.getTopmostVisiblePage().name);
   assertFalse($('manage-profile-overlay-delete').hidden);
   PageManager.closeOverlay();
   assertEquals('settings', PageManager.getTopmostVisiblePage().name);
 
   this.setProfileSupervised_(true, 'create');
   ManageProfileOverlay.showCreateDialog();
   assertEquals('settings', PageManager.getTopmostVisiblePage().name);
   ManageProfileOverlay.showDeleteDialog(this.testProfileInfo_(false));
-  assertEquals('settings', PageManager.getTopmostVisiblePage().name);
-});
-
-// Only non-supervised users should be able to delete profiles.
-TEST_F('ManageProfileUITest', 'SupervisedDelete', function() {
-  ManageProfileOverlay.showDeleteDialog(this.testProfileInfo_(false));
   assertEquals('manageProfile', PageManager.getTopmostVisiblePage().name);
-  assertFalse($('manage-profile-overlay-delete').hidden);
-
-  // Clicks the "Delete" button, after overriding chrome.send to record what
-  // messages were sent.
-  function clickAndListen() {
-    var originalChromeSend = chrome.send;
-    var chromeSendMessages = [];
-    chrome.send = function(message) {
-      chromeSendMessages.push(message);
-    };
-    $('delete-profile-ok').onclick();
-    // Restore the original function so the test framework can use it.
-    chrome.send = originalChromeSend;
-    return chromeSendMessages;
-  }
-
-  this.setProfileSupervised_(false, 'manage');
-  var messages = clickAndListen();
-  assertEquals(1, messages.length);
-  assertEquals('deleteProfile', messages[0]);
-  assertEquals('settings', PageManager.getTopmostVisiblePage().name);
-
-  ManageProfileOverlay.showDeleteDialog(this.testProfileInfo_(false));
-  this.setProfileSupervised_(true, 'manage');
-  messages = clickAndListen();
-  assertEquals(0, messages.length);
-  assertEquals('settings', PageManager.getTopmostVisiblePage().name);
 });
 
 // Selecting a different avatar image should update the suggested profile name.
 TEST_F('ManageProfileUITest', 'Create_NameUpdateOnAvatarSelected', function() {
   var mode = 'create';
   this.initDefaultProfiles_(mode);
 
   var gridEl = $(mode + '-profile-icon-grid');
   var nameEl = $(mode + '-profile-name');
 
@@ skipping 80 matching lines @@
 
   // Select another icon and check if the profile name was updated.
   var oldName = nameEl.value;
   gridEl.selectedItem = iconURLs[1];
   expectEquals(oldName, nameEl.value);
 
   PageManager.closeOverlay();
 });
 
 GEN('#endif  // OS_CHROMEOS');