Settings: do the same-path check after the main page special-case.

chrome/browser/ui/webui/options/options_browsertest.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.
 
 GEN('#include "chrome/browser/ui/webui/options/options_browsertest.h"');
 
 /** @const */ var MANAGED_USERS_PREF = 'profile.managed_users';
 
 /**
  * Wait for the method specified by |methodName|, on the |object| object, to be
@@ skipping 618 matching lines @@
       // Close the layer-1 overlay.
       OptionsPage.closeOverlay();
       self.verifyOpenPages_(['settings'], '');
       self.verifyHistory_(
           ['', 'languages', 'addLanguage', 'languages', ''],
           testDone);
     });
   });
 });
 
+// Test that closing an overlay that did not push history when opening does not
+// again push history.
+TEST_F('OptionsWebUIExtendedTest', 'CloseOverlayNoHistory', function() {
+  // Open the profile delete prompt.
+  ManageProfileOverlay.showDeleteDialog(BrowserOptions.getCurrentProfile());
+
+  // Opening the prompt does not add to the history.
+  var self = this;
+  this.verifyHistory_([''], function() {
+    // Close the overlay.
+    OptionsPage.closeOverlay();
+    // Still no history changes.
+    self.verifyHistory_([''], testDone);
+  });

[Dan Beam, 2014/05/30 21:13:17]

nit: instead of making |self|

  this.verifyHistory_([''], function() {
    ...
    this.verifyHistory_(...);
  }.bind(this));

[davidben, 2014/05/30 21:20:36]

Done. (Cool, I'm glad that's how we should be doing it in future. I much prefer
that idiom but everything else in this file uses self.)

+});
+
 // Make sure an overlay isn't closed (even temporarily) when another overlay is
 // opened on top.
 TEST_F('OptionsWebUIExtendedTest', 'OverlayAboveNoReset', function() {
   // Open a layer-1 overlay.
   OptionsPage.showPageByName('languages', true);
   this.verifyOpenPages_(['settings', 'languages']);
 
   // Open a layer-2 overlay on top. This should not close 'languages'.
   this.prohibitChangesToOverlay_(options.LanguageOptions.getInstance());
   OptionsPage.showPageByName('addLanguage', true);
@@ skipping 111 matching lines @@
   chrome.send('optionsTestSetPref', [MANAGED_USERS_PREF, {key: 'value'}]);
   waitForResponse(BrowserOptions, 'updateManagesSupervisedUsers', function() {
     assertFalse($('profiles-supervised-dashboard-tip').hidden);
     chrome.send('optionsTestSetPref', [MANAGED_USERS_PREF, {}]);
     waitForResponse(BrowserOptions, 'updateManagesSupervisedUsers', function() {
       assertTrue($('profiles-supervised-dashboard-tip').hidden);
       testDone();
     });
   });
 });