Clean up copy&paste in confirmation dialogs for prefs

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.
 
 /**
  * TestFixture for OptionsPage WebUI testing.
  * @extends {testing.Test}
  * @constructor
  */
 function OptionsWebUITest() {}
@@ skipping 96 matching lines @@
   defaultZoomFactor.selectedIndex = defaultZoomFactor.options.length - 1;
   var event = { target: defaultZoomFactor };
   if (defaultZoomFactor.onchange) defaultZoomFactor.onchange(event);
   testDone();
 });
 
 // If |confirmInterstitial| is true, the OK button of the Do Not Track
 // interstitial is pressed, otherwise the abort button is pressed.
 OptionsWebUITest.prototype.testDoNotTrackInterstitial =
     function(confirmInterstitial) {
+  Preferences.prefsFetchedCallback({'enable_do_not_track': {'value': false } });
   var buttonToClick = confirmInterstitial ? $('do-not-track-confirm-ok')
                                           : $('do-not-track-confirm-cancel');
   var dntCheckbox = $('do-not-track-enabled');
-  var dntOverlay = DoNotTrackConfirmOverlay.getInstance();
+  var dntOverlay = OptionsPage.registeredOverlayPages['donottrackconfirm'];
   assertFalse(dntCheckbox.checked);
 
   var visibleChangeCounter = 0;
   var visibleChangeHandler = function() {
     ++visibleChangeCounter;
     switch (visibleChangeCounter) {
       case 1:
         window.setTimeout(function() {
           assertTrue(dntOverlay.visible);
           buttonToClick.click();
         }, 0);
         break;
       case 2:
         window.setTimeout(function() {
           assertFalse(dntOverlay.visible);
           assertEquals(confirmInterstitial, dntCheckbox.checked);
-          DoNotTrackConfirmOverlay.getInstance().removeEventListener(
-              visibleChangeHandler);
+          dntOverlay.removeEventListener(visibleChangeHandler);
           testDone();
         }, 0);
         break;
       default:
         assertTrue(false);
     }
   }
-  DoNotTrackConfirmOverlay.getInstance().addEventListener('visibleChange',
-      visibleChangeHandler);
+  dntOverlay.addEventListener('visibleChange', visibleChangeHandler);
 
   if (confirmInterstitial) {
     this.mockHandler.expects(once()).setBooleanPref(
-        ["enable_do_not_track", true]);
+        ['enable_do_not_track', true, 'Options_DoNotTrackCheckbox']);
   } else {
     // The mock handler complains if setBooleanPref is called even though
     // it should not be.
   }
 
   dntCheckbox.click();
 }
 
 TEST_F('OptionsWebUITest', 'EnableDoNotTrackAndConfirmInterstitial',
        function() {
   this.testDoNotTrackInterstitial(true);
 });
 
 TEST_F('OptionsWebUITest', 'EnableDoNotTrackAndCancelInterstitial',
        function() {
   this.testDoNotTrackInterstitial(false);
 });
 
 // Check that the "Do not Track" preference can be correctly disabled.
 // In order to do that, we need to enable it first.
 TEST_F('OptionsWebUITest', 'EnableAndDisableDoNotTrack', function() {
+  Preferences.prefsFetchedCallback({'enable_do_not_track': {'value': false } });
   var dntCheckbox = $('do-not-track-enabled');
-  var dntOverlay = DoNotTrackConfirmOverlay.getInstance();
+  var dntOverlay = OptionsPage.registeredOverlayPages['donottrackconfirm'];
   assertFalse(dntCheckbox.checked);
 
   var visibleChangeCounter = 0;
   var visibleChangeHandler = function() {
     ++visibleChangeCounter;
     switch (visibleChangeCounter) {
       case 1:
         window.setTimeout(function() {
           assertTrue(dntOverlay.visible);
           $('do-not-track-confirm-ok').click();
         }, 0);
         break;
       case 2:
         window.setTimeout(function() {
           assertFalse(dntOverlay.visible);
           assertTrue(dntCheckbox.checked);
-          DoNotTrackConfirmOverlay.getInstance().removeEventListener(
-              visibleChangeHandler);
+          dntOverlay.removeEventListener(visibleChangeHandler);
           dntCheckbox.click();
         }, 0);
         break;
       default:
         assertNotReached();
     }
   }
-  DoNotTrackConfirmOverlay.getInstance().addEventListener('visibleChange',
-      visibleChangeHandler);
+  dntOverlay.addEventListener('visibleChange', visibleChangeHandler);
 
   this.mockHandler.expects(once()).setBooleanPref(
-      eq(["enable_do_not_track", true]));
+      eq(["enable_do_not_track", true, 'Options_DoNotTrackCheckbox']));
 
   var verifyCorrectEndState = function() {
     window.setTimeout(function() {
       assertFalse(dntOverlay.visible);
       assertFalse(dntCheckbox.checked);
       testDone();
     }, 0)
   }
   this.mockHandler.expects(once()).setBooleanPref(
       eq(["enable_do_not_track", false, 'Options_DoNotTrackCheckbox'])).will(
           callFunction(verifyCorrectEndState));
 
   dntCheckbox.click();
 });