Print Preview: Fix followup issues for removing global JS functions

chrome/browser/resources/print_preview/data/destination_store.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.
 
 cr.define('print_preview', function() {
   'use strict';
 
   /**
    * A data store that stores destinations and dispatches events when the data
    * store changes.
    * @param {!print_preview.NativeLayer} nativeLayer Used to fetch local print
    *     destinations.
    * @param {!print_preview.UserInfo} userInfo User information repository.
    * @param {!print_preview.AppState} appState Application state.
+   * @param {!WebUIListenerTracker} listenerTracker Tracker for WebUI listeners
+   *     added in DestinationStore constructor.
    * @constructor
    * @extends {cr.EventTarget}
    */
-  function DestinationStore(nativeLayer, userInfo, appState) {
+  function DestinationStore(nativeLayer, userInfo, appState, listenerTracker) {
     cr.EventTarget.call(this);
 
     /**
      * Used to fetch local print destinations.
      * @private {!print_preview.NativeLayer}
      */
     this.nativeLayer_ = nativeLayer;
 
     /**
      * User information repository.
@@ skipping 142 matching lines @@
 
     /**
      * Whether to default to the system default printer instead of the most
      * recent destination.
      * @private {boolean}
      */
     this.useSystemDefaultAsDefault_ =
         loadTimeData.getBoolean('useSystemDefaultPrinter');
 
     this.reset_();
+
+    this.addWebUIEventListeners_(listenerTracker);
   }
 
   /**
    * Event types dispatched by the data store.
    * @enum {string}
    */
   DestinationStore.EventType = {
     DESTINATION_SEARCH_DONE:
         'print_preview.DestinationStore.DESTINATION_SEARCH_DONE',
     DESTINATION_SEARCH_STARTED:
@@ skipping 351 matching lines @@
     get isCloudDestinationSearchInProgress() {
       return !!this.cloudPrintInterface_ &&
           this.cloudPrintInterface_.isCloudDestinationSearchInProgress;
     },
 
     /**
      * Starts listening for relevant WebUI events and adds the listeners to
      * |listenerTracker|. |listenerTracker| is responsible for removing the
      * listeners when necessary.
      * @param {!WebUIListenerTracker} listenerTracker
+     * @private
      */
-    addWebUIEventListeners: function(listenerTracker) {
+    addWebUIEventListeners_: function(listenerTracker) {
       listenerTracker.add(
           'privet-printer-added', this.onPrivetPrinterAdded_.bind(this));
       listenerTracker.add(
           'extension-printers-added',
           this.onExtensionPrintersAdded_.bind(this));
       listenerTracker.add(
           'reload-printer-list', this.onDestinationsReload.bind(this));
     },
 
     /**
@@ skipping 308 matching lines @@
           new RegExp('^' + id.replace(/[.*+?^${}()|[\]\\]/g, '\\$&') + '$'),
           null /*displayNameRegExp*/, false /*skipVirtualDestinations*/);
     },
 
     /**
      * Sets the destination store's Google Cloud Print interface.
      * @param {!cloudprint.CloudPrintInterface} cloudPrintInterface Interface
      *     to set.
      */
     setCloudPrintInterface: function(cloudPrintInterface) {
+      assert(this.cloudPrintInterface_ == null);
       this.cloudPrintInterface_ = cloudPrintInterface;
       this.tracker_.add(
           this.cloudPrintInterface_,
           cloudprint.CloudPrintInterfaceEventType.SEARCH_DONE,
           this.onCloudPrintSearchDone_.bind(this));
       this.tracker_.add(
           this.cloudPrintInterface_,
           cloudprint.CloudPrintInterfaceEventType.SEARCH_FAILED,
           this.onCloudPrintSearchDone_.bind(this));
       this.tracker_.add(
@@ skipping 760 matching lines @@
      */
     getKey_: function(destination) {
       return this.getDestinationKey_(
           destination.origin, destination.id, destination.account);
     }
   };
 
   // Export
   return {DestinationStore: DestinationStore};
 });