MD Settings: Rename and fix confusing prefs test function

chrome/browser/resources/settings/prefs/prefs.js

 /* Copyright 2015 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. */
 
 /**
  * @fileoverview
  * 'settings-prefs' exposes a singleton model of Chrome settings and
  * preferences, which listens to changes to Chrome prefs whitelisted in
  * chrome.settingsPrivate. When changing prefs in this element's 'prefs'
  * property via the UI, the singleton model tries to set those preferences in
@@ skipping 220 matching lines @@
 
     /**
      * Used to initialize the singleton with a fake SettingsPrivate.
      * @param {SettingsPrivate} settingsApi Fake implementation to use.
      */
     initializeForTesting: function(settingsApi) {
       this.singleton_.initialize(settingsApi);
     },
 
     /**
-     * Uninitializes this element to remove it from tests. Also resets
+     * Uninitializes this element to render it inert in tests. Also resets
      * settings-prefs-singleton, allowing newly created elements to
      * re-initialize it.
      */
-    resetForTesting: function() {
+    uninitializeForTesting: function() {
+      this.stopListening_();
       this.singleton_.resetForTesting();
     },
   });
 
   /**
    * Privately used element that contains, listens to and updates the shared
    * prefs state.
    */
   Polymer({
     is: 'settings-prefs-singleton',
@@ skipping 175 matching lines @@
       this.prefs = undefined;
       this.lastPrefValues_ = {};
       this.initialized_ = false;
       // Remove the listener added in initialize().
       this.settingsApi_.onPrefsChanged.removeListener(this.boundPrefsChanged_);
       this.settingsApi_ =
           /** @type {SettingsPrivate} */(chrome.settingsPrivate);
     },
   });
 })();