chrome_pass: move almost all @enums/@typedefs into cr.define()

Previously there were technical issues regarding @typedef in a
non-global (contextual?) scope. These were solved so we can return to a
saner model of exporting enums and @typedefs the same way as everything
else.

This is in hopes of removing cr.exportPath from --chrome_pass at least.
(We may forever benefit from the runtime effects.)

R=dpapad@chromium.org
BUG=986481

Change-Id: Ic07c7c87e3b6f6279167cee182d3c2fa0a10105e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1992697
Commit-Queue: Dan Beam <dbeam@chromium.org>
Auto-Submit: Dan Beam <dbeam@chromium.org>
Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#730033}

chrome/browser/resources/settings/chrome_cleanup_page/items_to_remove_list.js

@@ -2,24 +2,26 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-cr.exportPath('settings');
-
-/**
- * For each line in the item list, the text field will be shown in normal style
- * at front of the line. The highlightSuffix will be appended to the end of line
- * and emphasized with bold font.
+cr.define('settings', function() {
+  /**
+   * For each line in the item list, the text field will be shown in normal
+   * style at front of the line. The highlightSuffix will be appended to the end
+   * of line and emphasized with bold font.
    * @typedef {{
    *   text: string,
    *   highlightSuffix: ?string,
    * }}
    */
-settings.ChromeCleanupRemovalListItem;
+  let ChromeCleanupRemovalListItem;
 
-/**
+  /**
    * The default number of items to show for files, registry keys and extensions
    * on the detailed view when user-initiated cleanups are enabled.
    */
-settings.CHROME_CLEANUP_DEFAULT_ITEMS_TO_SHOW = 4;
+  const CHROME_CLEANUP_DEFAULT_ITEMS_TO_SHOW = 4;
+
+  return {ChromeCleanupRemovalListItem, CHROME_CLEANUP_DEFAULT_ITEMS_TO_SHOW};
+});
 
 /**
  * @fileoverview

chrome/browser/resources/settings/chromeos/device_page/device_page_browser_proxy.js

@@ -2,19 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-/** @fileoverview A helper object used for testing the Device page. */
-cr.exportPath('settings');
-
-/**
+cr.define('settings', function() {
+  /**
    * @typedef {{
    *   id: string,
    *   is_dedicated_charger: boolean,
    *   description: string
    * }}
    */
-settings.PowerSource;
+  let PowerSource;
 
-/**
+  /**
    * @typedef {{
    *   present: boolean,
    *   charging: boolean,
@@ -23,31 +21,31 @@ settings.PowerSource;
    *   statusText: string,
    * }}
    */
-settings.BatteryStatus;
+  let BatteryStatus;
 
-/**
+  /**
    * Mirrors chromeos::settings::PowerHandler::IdleBehavior.
    * @enum {number}
    */
-settings.IdleBehavior = {
+  const IdleBehavior = {
     DISPLAY_OFF_SLEEP: 0,
     DISPLAY_OFF: 1,
     DISPLAY_ON: 2,
     OTHER: 3,
-};
+  };
 
-/**
+  /**
    * Mirrors chromeos::PowerPolicyController::Action.
    * @enum {number}
    */
-settings.LidClosedBehavior = {
+  const LidClosedBehavior = {
     SUSPEND: 0,
     STOP_SESSION: 1,
     SHUT_DOWN: 2,
     DO_NOTHING: 3,
-};
+  };
 
-/**
+  /**
    * @typedef {{
    *   idleBehavior: settings.IdleBehavior,
    *   idleControlled: boolean,
@@ -56,37 +54,34 @@ settings.LidClosedBehavior = {
    *   hasLid: boolean,
    * }}
    */
-settings.PowerManagementSettings;
+  let PowerManagementSettings;
 
-/**
+  /**
    * A note app's availability for running as note handler app from lock screen.
    * Mirrors chromeos::NoteTakingLockScreenSupport.
    * @enum {number}
    */
-settings.NoteAppLockScreenSupport = {
-  NOT_SUPPORTED: 0,
-  NOT_ALLOWED_BY_POLICY: 1,
-  SUPPORTED: 2,
-  ENABLED: 3
-};
-
-/**
- * @typedef {{name:string,
+  const NoteAppLockScreenSupport =
+      {NOT_SUPPORTED: 0, NOT_ALLOWED_BY_POLICY: 1, SUPPORTED: 2, ENABLED: 3};
+
+  /**
+   * @typedef {{
+   *   name:string,
    *   value:string,
    *   preferred:boolean,
- *            lockScreenSupport: settings.NoteAppLockScreenSupport}}
+   *   lockScreenSupport: settings.NoteAppLockScreenSupport,
+   * }}
    */
-settings.NoteAppInfo;
+  let NoteAppInfo;
 
-/**
+  /**
    * @typedef {{
    *   label: string,
    *   uuid: string
    * }}
    */
-settings.ExternalStorage;
+  let ExternalStorage;
 
-cr.define('settings', function() {
   /** @interface */
   class DevicePageBrowserProxy {
     /** Initializes the mouse and touchpad handler. */
@@ -267,7 +262,15 @@ cr.define('settings', function() {
   cr.addSingletonGetter(DevicePageBrowserProxyImpl);
 
   return {
-    DevicePageBrowserProxy: DevicePageBrowserProxy,
-    DevicePageBrowserProxyImpl: DevicePageBrowserProxyImpl,
+    BatteryStatus,
+    DevicePageBrowserProxy,
+    DevicePageBrowserProxyImpl,
+    ExternalStorage,
+    IdleBehavior,
+    LidClosedBehavior,
+    NoteAppInfo,
+    NoteAppLockScreenSupport,
+    PowerManagementSettings,
+    PowerSource,
   };
 });

chrome/browser/resources/settings/chromeos/device_page/storage.js

@@ -2,25 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-/**
- * @fileoverview
- * 'settings-storage' is the settings subpage for storage settings.
- */
-cr.exportPath('settings');
-
-/**
+cr.define('settings', function() {
+  /**
    * Enumeration for device state about remaining space.
    * These values must be kept in sync with
    * StorageManagerHandler::StorageSpaceState in C++ code.
    * @enum {number}
    */
-settings.StorageSpaceState = {
-  NORMAL: 0,
-  LOW: 1,
-  CRITICALLY_LOW: 2
-};
+  const StorageSpaceState = {NORMAL: 0, LOW: 1, CRITICALLY_LOW: 2};
 
-/**
+  /**
    * @typedef {{
    *   totalSize: string,
    *   availableSize: string,
@@ -29,7 +20,10 @@ settings.StorageSpaceState = {
    *   spaceState: settings.StorageSpaceState,
    * }}
    */
-settings.StorageSizeStat;
+  let StorageSizeStat;
+
+  return {StorageSpaceState, StorageSizeStat};
+});
 
 Polymer({
   is: 'settings-storage',

chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_browser_proxy.js

@@ -2,23 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-cr.exportPath('settings');
-
-/**
+cr.define('settings', function() {
+  /**
    * An object containing messages for web permissisions origin
    * and the messages multidevice feature state.
    *
    * @typedef {{origin: string,
    *            enabled: boolean}}
    */
-settings.AndroidSmsInfo;
+  let AndroidSmsInfo;
 
-cr.define('settings', function() {
   /** @interface */
   class MultiDeviceBrowserProxy {
     showMultiDeviceSetupDialog() {}
 
-    /** @return {!Promise<!MultiDevicePageContentData>} */
+    /** @return {!Promise<!settings.MultiDevicePageContentData>} */
     getPageContentData() {}
 
     /**
@@ -132,7 +130,8 @@ cr.define('settings', function() {
   cr.addSingletonGetter(MultiDeviceBrowserProxyImpl);
 
   return {
-    MultiDeviceBrowserProxy: MultiDeviceBrowserProxy,
-    MultiDeviceBrowserProxyImpl: MultiDeviceBrowserProxyImpl,
+    AndroidSmsInfo,
+    MultiDeviceBrowserProxy,
+    MultiDeviceBrowserProxyImpl,
   };
 });

chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_constants.js

@@ -49,25 +49,18 @@ cr.define('settings', function() {
     FURTHER_SETUP_REQUIRED: 8,
   };
 
-  return {
-    MultiDeviceSettingsMode: MultiDeviceSettingsMode,
-    MultiDeviceFeature: MultiDeviceFeature,
-    MultiDeviceFeatureState: MultiDeviceFeatureState,
-  };
-});
-
-/**
+  /**
    * Container for the initial data that the page requires in order to display
    * the correct content. It is also used for receiving status updates during
    * use. Note that the host device may be verified (enabled or disabled),
    * awaiting verification, or it may have failed setup because it was not able
    * to connect to the server.
    *
- * For each MultiDevice feature (including the "suite" feature, which acts as a
- * gatekeeper for the others), the corresponding *State property is an enum
- * containing the data necessary to display it. Note that hostDeviceName should
- * be undefined if and only if no host has been set up, regardless of whether
- * there are potential hosts on the account.
+   * For each MultiDevice feature (including the "suite" feature, which acts as
+   * a gatekeeper for the others), the corresponding *State property is an enum
+   * containing the data necessary to display it. Note that hostDeviceName
+   * should be undefined if and only if no host has been set up, regardless of
+   * whether there are potential hosts on the account.
    *
    * @typedef {{
    *   mode: !settings.MultiDeviceSettingsMode,
@@ -79,4 +72,12 @@ cr.define('settings', function() {
    *   isAndroidSmsPairingComplete: boolean
    * }}
    */
-let MultiDevicePageContentData;
+  let MultiDevicePageContentData;
+
+  return {
+    MultiDeviceSettingsMode,
+    MultiDeviceFeature,
+    MultiDeviceFeatureState,
+    MultiDevicePageContentData,
+  };
+});

chrome/browser/resources/settings/chromeos/os_people_page/fingerprint_browser_proxy.js

@@ -2,14 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-cr.exportPath('settings');
-
-/**
+cr.define('settings', function() {
+  /**
    * @enum {number}
    * These values must be kept in sync with the values in
    * third_party/cros_system_api/dbus/service_constants.h.
    */
-settings.FingerprintResultType = {
+  const FingerprintResultType = {
     SUCCESS: 0,
     PARTIAL: 1,
     INSUFFICIENT: 2,
@@ -17,9 +16,9 @@ settings.FingerprintResultType = {
     TOO_SLOW: 4,
     TOO_FAST: 5,
     IMMOBILE: 6,
-};
+  };
 
-/**
+  /**
    * An object describing a attempt from the fingerprint hardware. The structure
    * of this data must be kept in sync with C++ FingerprintHandler.
    * @typedef {{
@@ -27,9 +26,9 @@ settings.FingerprintResultType = {
    *   indexes: !Array<number>,
    * }}
    */
-settings.FingerprintAttempt;
+  let FingerprintAttempt;
 
-/**
+  /**
    * An object describing a scan from the fingerprint hardware. The structure of
    * this data must be kept in sync with C++ FingerprintHandler.
    * @typedef {{
@@ -38,9 +37,9 @@ settings.FingerprintAttempt;
    *   percentComplete: number,
    * }}
    */
-settings.FingerprintScan;
+  let FingerprintScan;
 
-/**
+  /**
    * An object describing the necessary info to display on the fingerprint
    * settings. The structure of this data must be kept in sync with
    * C++ FingerprintHandler.
@@ -49,9 +48,8 @@ settings.FingerprintScan;
    *   isMaxed: boolean,
    * }}
    */
-settings.FingerprintInfo;
+  let FingerprintInfo;
 
-cr.define('settings', function() {
   /** @interface */
   class FingerprintBrowserProxy {
     /**
@@ -159,7 +157,11 @@ cr.define('settings', function() {
   cr.addSingletonGetter(FingerprintBrowserProxyImpl);
 
   return {
-    FingerprintBrowserProxy: FingerprintBrowserProxy,
-    FingerprintBrowserProxyImpl: FingerprintBrowserProxyImpl,
+    FingerprintAttempt,
+    FingerprintBrowserProxy,
+    FingerprintBrowserProxyImpl,
+    FingerprintInfo,
+    FingerprintResultType,
+    FingerprintScan,
   };
 });

chrome/browser/resources/settings/chromeos/os_people_page/kerberos_accounts_browser_proxy.js

@@ -7,9 +7,9 @@
  * the "People" section of Settings, to interact with the browser. Chrome OS
  * only.
  */
-cr.exportPath('settings');
 
-/**
+cr.define('settings', function() {
+  /**
    * Information for a Chrome OS Kerberos account.
    * @typedef {{
    *   principalName: string,
@@ -22,9 +22,9 @@ cr.exportPath('settings');
    *   validForDuration: string
    * }}
    */
-settings.KerberosAccount;
+  let KerberosAccount;
 
-/**
+  /**
    * @typedef {{
    *   error: !settings.KerberosErrorType,
    *   errorInfo: !{
@@ -33,9 +33,8 @@ settings.KerberosAccount;
    *   }
    * }}
    */
-settings.ValidateKerberosConfigResult;
+  let ValidateKerberosConfigResult;
 
-cr.define('settings', function() {
   /**
    *  @enum {number}
    *  These values must be kept in sync with the ErrorType enum in
@@ -163,9 +162,11 @@ cr.define('settings', function() {
   cr.addSingletonGetter(KerberosAccountsBrowserProxyImpl);
 
   return {
-    KerberosErrorType: KerberosErrorType,
-    KerberosConfigErrorCode: KerberosConfigErrorCode,
-    KerberosAccountsBrowserProxy: KerberosAccountsBrowserProxy,
-    KerberosAccountsBrowserProxyImpl: KerberosAccountsBrowserProxyImpl,
+    KerberosAccount,
+    KerberosErrorType,
+    KerberosConfigErrorCode,
+    KerberosAccountsBrowserProxy,
+    KerberosAccountsBrowserProxyImpl,
+    ValidateKerberosConfigResult,
   };
 });

chrome/browser/resources/settings/chromeos/os_people_page/os_sync_browser_proxy.js

@@ -2,13 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-/**
- * @fileoverview A helper object to get the status of the sync backend and user
- * preferences on what data to sync.
- */
-cr.exportPath('settings');
-
-/**
+cr.define('settings', function() {
+  /**
    * User preferences for OS sync. 'Registered' means the user has the option to
    * select a type. For example, a type might not be registered due to a feature
    * flag being disabled.
@@ -27,9 +22,8 @@ cr.exportPath('settings');
    *   wifiConfigurationsSynced: boolean,
    * }}
    */
-settings.OsSyncPrefs;
+  let OsSyncPrefs;
 
-cr.define('settings', function() {
   /** @interface */
   class OsSyncBrowserProxy {
     /**
@@ -86,7 +80,8 @@ cr.define('settings', function() {
   cr.addSingletonGetter(OsSyncBrowserProxyImpl);
 
   return {
-    OsSyncBrowserProxy: OsSyncBrowserProxy,
-    OsSyncBrowserProxyImpl: OsSyncBrowserProxyImpl,
+    OsSyncBrowserProxy,
+    OsSyncBrowserProxyImpl,
+    OsSyncPrefs,
   };
 });

chrome/browser/resources/settings/incompatible_applications_page/incompatible_applications_browser_proxy.js

@@ -2,14 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-/**
- * @fileoverview A helper object used from the Incompatible Applications section
- * to interact with the browser.
- */
-
-cr.exportPath('settings');
-
-/**
+cr.define('settings', function() {
+  /**
    * All possible actions to take on an incompatible application.
    *
    * Must be kept in sync with BlacklistMessageType in
@@ -17,22 +11,21 @@ cr.exportPath('settings');
    * @readonly
    * @enum {number}
    */
-settings.ActionTypes = {
+  const ActionTypes = {
     UNINSTALL: 0,
     MORE_INFO: 1,
     UPGRADE: 2,
-};
+  };
 
-/**
+  /**
    * @typedef {{
    *   name: string,
    *   actionType: {settings.ActionTypes},
    *   actionUrl: string,
    * }}
    */
-settings.IncompatibleApplication;
+  let IncompatibleApplication;
 
-cr.define('settings', function() {
   /** @interface */
   class IncompatibleApplicationsBrowserProxy {
     /**
@@ -116,8 +109,9 @@ cr.define('settings', function() {
   cr.addSingletonGetter(IncompatibleApplicationsBrowserProxyImpl);
 
   return {
-    IncompatibleApplicationsBrowserProxy: IncompatibleApplicationsBrowserProxy,
-    IncompatibleApplicationsBrowserProxyImpl:
+    ActionTypes,
+    IncompatibleApplication,
+    IncompatibleApplicationsBrowserProxy,
     IncompatibleApplicationsBrowserProxyImpl,
   };
 });

chrome/browser/resources/settings/people_page/account_manager_browser_proxy.js

@@ -2,14 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-/**
- * @fileoverview A helper object used from the "Google Accounts" subsection of
- * the "People" section of Settings, to interact with the browser. Chrome OS
- * only.
- */
-cr.exportPath('settings');
-
-/**
+cr.define('settings', function() {
+  /**
    * Information for an account managed by Chrome OS AccountManager.
    * @typedef {{
    *   id: string,
@@ -23,9 +17,8 @@ cr.exportPath('settings');
    *   organization: (string|undefined),
    * }}
    */
-settings.Account;
+  let Account;
 
-cr.define('settings', function() {
   /** @interface */
   class AccountManagerBrowserProxy {
     /**
@@ -41,17 +34,17 @@ cr.define('settings', function() {
 
     /**
      * Triggers the re-authentication flow for the account pointed to by
-     * |account_email|.
-     * @param {string} account_email
+     * |accountEmail|.
+     * @param {string} accountEmail
      */
-    reauthenticateAccount(account_email) {}
+    reauthenticateAccount(accountEmail) {}
 
     /**
      * Triggers the migration dialog for the account pointed to by
-     * |account_email|.
-     * @param {string} account_email
+     * |accountEmail|.
+     * @param {string} accountEmail
      */
-    migrateAccount(account_email) {}
+    migrateAccount(accountEmail) {}
 
     /**
      * Removes |account| from Account Manager.
@@ -80,13 +73,13 @@ cr.define('settings', function() {
     }
 
     /** @override */
-    reauthenticateAccount(account_email) {
-      chrome.send('reauthenticateAccount', [account_email]);
+    reauthenticateAccount(accountEmail) {
+      chrome.send('reauthenticateAccount', [accountEmail]);
     }
 
     /** @override */
-    migrateAccount(account_email) {
-      chrome.send('migrateAccount', [account_email]);
+    migrateAccount(accountEmail) {
+      chrome.send('migrateAccount', [accountEmail]);
     }
 
     /** @override */
@@ -103,7 +96,8 @@ cr.define('settings', function() {
   cr.addSingletonGetter(AccountManagerBrowserProxyImpl);
 
   return {
-    AccountManagerBrowserProxy: AccountManagerBrowserProxy,
-    AccountManagerBrowserProxyImpl: AccountManagerBrowserProxyImpl,
+    Account,
+    AccountManagerBrowserProxy,
+    AccountManagerBrowserProxyImpl,
   };
 });

chrome/browser/resources/settings/people_page/change_picture_browser_proxy.js

@@ -2,13 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-/**
- * @fileoverview A helper object used from the "Change Picture" subpage of
- * the People section to interact with the browser. ChromeOS only.
- */
-cr.exportPath('settings');
-
-/**
+cr.define('settings', function() {
+  /**
    * An object describing a default image.
    * @typedef {{
    *   author: (string|undefined),
@@ -18,9 +13,8 @@ cr.exportPath('settings');
    *   website: (string|undefined)
    * }}
    */
-settings.DefaultImage;
+  let DefaultImage;
 
-cr.define('settings', function() {
   /** @interface */
   class ChangePictureBrowserProxy {
     /**
@@ -113,7 +107,8 @@ cr.define('settings', function() {
   cr.addSingletonGetter(ChangePictureBrowserProxyImpl);
 
   return {
-    ChangePictureBrowserProxy: ChangePictureBrowserProxy,
-    ChangePictureBrowserProxyImpl: ChangePictureBrowserProxyImpl,
+    ChangePictureBrowserProxy,
+    ChangePictureBrowserProxyImpl,
+    DefaultImage,
   };
 });

chrome/browser/resources/settings/people_page/import_data_browser_proxy.js

@@ -2,13 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-/**
- * @fileoverview A helper object used from the the Import Data dialog to allow
- * users to import data (like bookmarks) from other web browsers.
- */
-cr.exportPath('settings');
-
-/**
+cr.define('settings', function() {
+  /**
    * An object describing a source browser profile that may be imported.
    * The structure of this data must be kept in sync with C++ ImportDataHandler.
    * @typedef {{
@@ -21,20 +16,19 @@ cr.exportPath('settings');
    *   autofillFormData: boolean,
    * }}
    */
-settings.BrowserProfile;
+  let BrowserProfile;
 
-/**
+  /**
    * @enum {string}
    * These string values must be kept in sync with the C++ ImportDataHandler.
    */
-settings.ImportDataStatus = {
+  const ImportDataStatus = {
     INITIAL: 'initial',
     IN_PROGRESS: 'inProgress',
     SUCCEEDED: 'succeeded',
     FAILED: 'failed',
-};
+  };
 
-cr.define('settings', function() {
   /** @interface */
   class ImportDataBrowserProxy {
     /**
@@ -81,7 +75,9 @@ cr.define('settings', function() {
   cr.addSingletonGetter(ImportDataBrowserProxyImpl);
 
   return {
-    ImportDataBrowserProxy: ImportDataBrowserProxy,
-    ImportDataBrowserProxyImpl: ImportDataBrowserProxyImpl,
+    BrowserProfile,
+    ImportDataStatus,
+    ImportDataBrowserProxy,
+    ImportDataBrowserProxyImpl,
   };
 });

chrome/browser/resources/settings/people_page/profile_info_browser_proxy.js

@@ -2,23 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-/**
- * @fileoverview A helper object used from the the People section to get the
- * profile info, which consists of the profile name and icon. Used for both
- * Chrome browser and ChromeOS.
- */
-cr.exportPath('settings');
-
-/**
+cr.define('settings', function() {
+  /**
    * An object describing the profile.
    * @typedef {{
    *   name: string,
    *   iconUrl: string
    * }}
    */
-settings.ProfileInfo;
+  let ProfileInfo;
 
-cr.define('settings', function() {
   /** @interface */
   class ProfileInfoBrowserProxy {
     /**
@@ -51,7 +44,5 @@ cr.define('settings', function() {
 
   cr.addSingletonGetter(ProfileInfoBrowserProxyImpl);
 
-  return {
-    ProfileInfoBrowserProxyImpl: ProfileInfoBrowserProxyImpl,
-  };
+  return {ProfileInfo, ProfileInfoBrowserProxyImpl};
 });

chrome/browser/resources/settings/people_page/sync_browser_proxy.js

@@ -2,23 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-/**
- * @fileoverview A helper object used from the the People section to get the
- * status of the sync backend and user preferences on what data to sync. Used
- * for both Chrome browser and ChromeOS.
- */
-cr.exportPath('settings');
-
-/**
+cr.define('settings', function() {
+  /**
    * @typedef {{fullName: (string|undefined),
    *            givenName: (string|undefined),
    *            email: string,
    *            avatarImage: (string|undefined)}}
    * @see chrome/browser/ui/webui/settings/people_handler.cc
    */
-settings.StoredAccount;
+  let StoredAccount;
 
-/**
+  /**
    * @typedef {{childUser: (boolean|undefined),
    *            disabled: (boolean|undefined),
    *            domain: (string|undefined),
@@ -37,15 +31,14 @@ settings.StoredAccount;
    *            syncSystemEnabled: (boolean|undefined)}}
    * @see chrome/browser/ui/webui/settings/people_handler.cc
    */
-settings.SyncStatus;
-
+  let SyncStatus;
 
-/**
+  /**
    * Must be kept in sync with the return values of getSyncErrorAction in
    * chrome/browser/ui/webui/settings/people_handler.cc
    * @enum {string}
    */
-settings.StatusAction = {
+  const StatusAction = {
     NO_ACTION: 'noAction',             // No action to take.
     REAUTHENTICATE: 'reauthenticate',  // User needs to reauthenticate.
     SIGNOUT_AND_SIGNIN:
@@ -56,9 +49,9 @@ settings.StatusAction = {
     RETRIEVE_TRUSTED_VAULT_KEYS: 'retrieveTrustedVaultKeys',
     CONFIRM_SYNC_SETTINGS:
         'confirmSyncSettings',  // User needs to confirm sync settings.
-};
+  };
 
-/**
+  /**
    * The state of sync. This is the data structure sent back and forth between
    * C++ and JS. Its naming and structure is not optimal, but changing it would
    * require changes to the C++ handler, which is already functional.
@@ -93,20 +86,17 @@ settings.StatusAction = {
    *   typedUrlsSynced: boolean,
    * }}
    */
-settings.SyncPrefs;
+  let SyncPrefs;
 
-/**
- * @enum {string}
- */
-settings.PageStatus = {
+  /** @enum {string} */
+  const PageStatus = {
     SPINNER: 'spinner',      // Before the page has loaded.
     CONFIGURE: 'configure',  // Preferences ready to be configured.
     TIMEOUT: 'timeout',      // Preferences loading has timed out.
     DONE: 'done',            // Sync subpage can be closed now.
     PASSPHRASE_FAILED: 'passphraseFailed',  // Error in the passphrase.
-};
+  };
 
-cr.define('settings', function() {
   /**
    * Key to be used with localStorage.
    * @type {string}
@@ -319,7 +309,12 @@ cr.define('settings', function() {
   cr.addSingletonGetter(SyncBrowserProxyImpl);
 
   return {
-    SyncBrowserProxy: SyncBrowserProxy,
-    SyncBrowserProxyImpl: SyncBrowserProxyImpl,
+    PageStatus,
+    StatusAction,
+    StoredAccount,
+    SyncBrowserProxy,
+    SyncBrowserProxyImpl,
+    SyncPrefs,
+    SyncStatus,
   };
 });

chrome/browser/resources/settings/privacy_page/privacy_page.js

@@ -2,15 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-cr.exportPath('settings');
-
-/**
+cr.define('settings', function() {
+  /**
    * @typedef {{
    *   enabled: boolean,
    *   pref: !chrome.settingsPrivate.PrefObject
    * }}
    */
-let BlockAutoplayStatus;
+  let BlockAutoplayStatus;
+
+  return {BlockAutoplayStatus};
+});
 
 /**
  * @fileoverview
@@ -142,11 +144,11 @@ Polymer({
       }
     },
 
-    /** @private {BlockAutoplayStatus} */
+    /** @private {settings.BlockAutoplayStatus} */
     blockAutoplayStatus_: {
       type: Object,
       value: function() {
-        return /** @type {BlockAutoplayStatus} */ ({});
+        return /** @type {settings.BlockAutoplayStatus} */ ({});
       }
     },
 
@@ -323,7 +325,7 @@ Polymer({
 
   /**
    * Called when the block autoplay status changes.
-   * @param {BlockAutoplayStatus} autoplayStatus
+   * @param {settings.BlockAutoplayStatus} autoplayStatus
    * @private
    */
   onBlockAutoplayStatusChanged_: function(autoplayStatus) {

chrome/browser/resources/settings/privacy_page/security_keys_bio_enroll_dialog.js

@@ -68,7 +68,7 @@ Polymer({
 
     /**
      * The list of enrollments displayed.
-     * @private {!Array<!Enrollment>}
+     * @private {!Array<!settings.Enrollment>}
      */
     enrollments_: Array,
 
@@ -135,7 +135,7 @@ Polymer({
 
   /**
    * @private
-   * @param {!Array<!Enrollment>} enrollments
+   * @param {!Array<!settings.Enrollment>} enrollments
    */
   onEnrollments_: function(enrollments) {
     this.enrollments_ = enrollments;
@@ -210,10 +210,10 @@ Polymer({
 
   /**
    * @private
-   * @param {!EnrollmentStatus} response
+   * @param {!settings.EnrollmentStatus} response
    */
   onEnrolling_: function(response) {
-    if (response.code == Ctap2Status.ERR_KEEPALIVE_CANCEL) {
+    if (response.code == settings.Ctap2Status.ERR_KEEPALIVE_CANCEL) {
       this.showEnrollmentsPage_();
       return;
     }

chrome/browser/resources/settings/privacy_page/security_keys_browser_proxy.js

@@ -2,21 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-cr.exportPath('settings');
-
-/**
+cr.define('settings', function() {
+  /**
    * Ctap2Status contains a subset of CTAP2 status codes. See
    * device::CtapDeviceResponseCode for the full list.
    * @enum {number}
    */
-const Ctap2Status = {
+  const Ctap2Status = {
     OK: 0x0,
     ERR_KEEPALIVE_CANCEL: 0x2D,
-};
+  };
 
-/**
- * Credential represents a CTAP2 resident credential enumerated from a security
- * key.
+  /**
+   * Credential represents a CTAP2 resident credential enumerated from a
+   * security key.
    *
    * id: (required) The hex encoding of the CBOR-serialized
    *     PublicKeyCredentialDescriptor of the credential.
@@ -34,13 +33,14 @@ const Ctap2Status = {
    *            userDisplayName: string}}
    * @see chrome/browser/ui/webui/settings/settings_security_key_handler.cc
    */
-let Credential;
+  let Credential;
 
-/**
- * EnrollmentStatus represents the current status of an enrollment suboperation,
- * where 'remaining' is the number of samples left, 'status' is the last
- * enrollment status, 'code' indicates the final CtapDeviceResponseCode of the
- * operation, and 'enrollment' contains the new Enrollment.
+  /**
+   * EnrollmentStatus represents the current status of an enrollment
+   * suboperation, where 'remaining' is the number of samples left, 'status' is
+   * the last enrollment status, 'code' indicates the final
+   * CtapDeviceResponseCode of the operation, and 'enrollment' contains the new
+   * Enrollment.
    *
    * For each enrollment sample, 'status' is set - when the enrollment operation
    * reaches an end state, 'code' and, if successful, 'enrollment' are set. |OK|
@@ -48,24 +48,23 @@ let Credential;
    * user-initated cancellation.
    *
    * @typedef {{status: ?number,
- *            code: ?Ctap2Status,
+   *            code: ?settings.Ctap2Status,
    *            remaining: number,
- *            enrollment: ?Enrollment}}
+   *            enrollment: ?settings.Enrollment}}
    * @see chrome/browser/ui/webui/settings/settings_security_key_handler.cc
    */
-let EnrollmentStatus;
+  let EnrollmentStatus;
 
-/**
- * Enrollment represents a valid fingerprint template stored on a security key,
- * which can be used in a user verification request.
+  /**
+   * Enrollment represents a valid fingerprint template stored on a security
+   * key, which can be used in a user verification request.
    *
    * @typedef {{name: string,
    *            id: string}}
    * @see chrome/browser/ui/webui/settings/settings_security_key_handler.cc
    */
-let Enrollment;
+  let Enrollment;
 
-cr.define('settings', function() {
   /** @interface */
   class SecurityKeysPINBrowserProxy {
     /**
@@ -121,7 +120,7 @@ cr.define('settings', function() {
      * Enumerates credentials on the authenticator. A correct PIN must have
      * previously been supplied via providePIN() before this
      * method may be called.
-     * @return {!Promise<!Array<!Credential>>}
+     * @return {!Promise<!Array<!settings.Credential>>}
      */
     enumerateCredentials() {}
 
@@ -187,7 +186,7 @@ cr.define('settings', function() {
      * previously been supplied via bioEnrollProvidePIN() before this method may
      * be called.
      *
-     * @return {!Promise<!Array<!Enrollment>>}
+     * @return {!Promise<!Array<!settings.Enrollment>>}
      */
     enumerateEnrollments() {}
 
@@ -202,8 +201,8 @@ cr.define('settings', function() {
      * out waiting for a touch, or has successfully processed a touch. Any
      * errors will fire the 'security-keys-bio-enrollment-error' WebListener.
      *
-     * @return {!Promise<!EnrollmentStatus>} resolves when the enrollment
-     *     operation is finished successfully.
+     * @return {!Promise<!settings.EnrollmentStatus>} resolves when the
+     *     enrollment operation is finished successfully.
      */
     startEnrolling() {}
 
@@ -218,7 +217,8 @@ cr.define('settings', function() {
      * Deletes the enrollment with the given ID.
      *
      * @param {string} id
-     * @return {!Promise<!Array<!Enrollment>>} The remaining enrollments.
+     * @return {!Promise<!Array<!settings.Enrollment>>} The remaining
+     *     enrollments.
      */
     deleteEnrollment(id) {}
 
@@ -227,7 +227,8 @@ cr.define('settings', function() {
      *
      * @param {string} id
      * @param {string} name
-     * @return {!Promise<!Array<!Enrollment>>} The updated list of enrollments.
+     * @return {!Promise<!Array<!settings.Enrollment>>} The updated list of
+     *     enrollments.
      */
     renameEnrollment(id, name) {}
 
@@ -350,14 +351,17 @@ cr.define('settings', function() {
   cr.addSingletonGetter(SecurityKeysBioEnrollProxyImpl);
 
   return {
-    SecurityKeysPINBrowserProxy: SecurityKeysPINBrowserProxy,
-    SecurityKeysPINBrowserProxyImpl: SecurityKeysPINBrowserProxyImpl,
-    SecurityKeysCredentialBrowserProxy: SecurityKeysCredentialBrowserProxy,
-    SecurityKeysCredentialBrowserProxyImpl:
+    Credential,
+    Ctap2Status,
+    Enrollment,
+    EnrollmentStatus,
+    SecurityKeysBioEnrollProxy,
+    SecurityKeysBioEnrollProxyImpl,
+    SecurityKeysCredentialBrowserProxy,
     SecurityKeysCredentialBrowserProxyImpl,
-    SecurityKeysResetBrowserProxy: SecurityKeysResetBrowserProxy,
-    SecurityKeysResetBrowserProxyImpl: SecurityKeysResetBrowserProxyImpl,
-    SecurityKeysBioEnrollProxy: SecurityKeysBioEnrollProxy,
-    SecurityKeysBioEnrollProxyImpl: SecurityKeysBioEnrollProxyImpl,
+    SecurityKeysPINBrowserProxy,
+    SecurityKeysPINBrowserProxyImpl,
+    SecurityKeysResetBrowserProxy,
+    SecurityKeysResetBrowserProxyImpl,
   };
 });

chrome/browser/resources/settings/privacy_page/security_keys_credential_management_dialog.js

@@ -47,7 +47,7 @@ Polymer({
 
     /**
      * The list of credentials displayed in the dialog.
-     * @private {!Array<!Credential>}
+     * @private {!Array<!settings.Credential>}
      */
     credentials_: Array,
 
@@ -125,7 +125,7 @@ Polymer({
 
   /**
    * @private
-   * @param {!Array<!Credential>} credentials
+   * @param {!Array<!settings.Credential>} credentials
    */
   onCredentials_: function(credentials) {
     if (!credentials.length) {
@@ -193,7 +193,7 @@ Polymer({
   /**
    * Stringifies the user entity of a Credential for display in the dialog.
    * @private
-   * @param {!Credential} credential
+   * @param {!settings.Credential} credential
    * @return {string}
    */
   formatUser_: function(credential) {

chrome/browser/resources/settings/search_settings.js

@@ -2,9 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-cr.exportPath('settings');
-
-/**
+cr.define('settings', function() {
+  /**
    * A data structure used by callers to combine the results of multiple search
    * requests.
    *
@@ -14,9 +13,8 @@ cr.exportPath('settings');
    *   wasClearSearch: Boolean,
    * }}
    */
-settings.SearchResult;
+  let SearchResult;
 
-cr.define('settings', function() {
   /**
    * A CSS attribute indicating that a node should be ignored during searching.
    * @type {string}
@@ -621,8 +619,9 @@ cr.define('settings', function() {
   }
 
   return {
-    getSearchManager: getSearchManager,
-    setSearchManagerForTesting: setSearchManagerForTesting,
-    SearchRequest: SearchRequest,
+    getSearchManager,
+    setSearchManagerForTesting,
+    SearchRequest,
+    SearchResult,
   };
 });

chrome/test/data/webui/settings/security_keys_subpage_test.js

@@ -912,7 +912,7 @@ suite('SecurityKeysBioEnrollment', function() {
         test_util.eventToPromise('bio-enroll-dialog-ready-for-testing', dialog);
     dialog.$.cancelButton.click();
     await browserProxy.whenCalled('cancelEnrollment');
-    enrollResolver.resolve({code: Ctap2Status.ERR_KEEPALIVE_CANCEL});
+    enrollResolver.resolve({code: settings.Ctap2Status.ERR_KEEPALIVE_CANCEL});
     await browserProxy.whenCalled('enumerateEnrollments');
 
     await uiReady;