Merges two options reset overlay classes

chrome/browser/resources/options/options.js

Index: chrome/browser/resources/options/options.js
diff --git a/chrome/browser/resources/options/options.js b/chrome/browser/resources/options/options.js
index e385d835c40949b14a032611b4b563ddd5dbb372..b79b7104350ddc46aa03a2798ef94d7071478075 100644
--- a/chrome/browser/resources/options/options.js
+++ b/chrome/browser/resources/options/options.js
@@ -47,8 +47,6 @@ var SupervisedUserImportOverlay = options.SupervisedUserImportOverlay;
 var SupervisedUserLearnMoreOverlay = options.SupervisedUserLearnMoreOverlay;
 var SyncSetupOverlay = options.SyncSetupOverlay;
 var ThirdPartyImeConfirmOverlay = options.ThirdPartyImeConfirmOverlay;
-var TriggeredResetProfileSettingsOverlay =
-    options.TriggeredResetProfileSettingsOverlay;
 
 /**
  * DOMContentLoaded handler, sets up the page.
@@ -165,9 +163,10 @@ function load() {
   PageManager.registerOverlay(PasswordManager.getInstance(),
                               BrowserOptions.getInstance(),
                               [$('manage-passwords')]);
-  PageManager.registerOverlay(ResetProfileSettingsOverlay.getInstance(),
-                              BrowserOptions.getInstance(),
-                              [$('reset-profile-settings')]);
+  PageManager.registerOverlay(
+      new ResetProfileSettingsOverlay(false),

[Dan Beam, 2016/09/14 21:22:37]

new ResetProfileSettingsOverlay(false /* isTriggered */)

[alito, 2016/09/14 23:37:45]

Done.

+      BrowserOptions.getInstance(),
+      [$('reset-profile-settings')]);
   PageManager.registerOverlay(SearchEngineManager.getInstance(),
                               BrowserOptions.getInstance(),
                               [$('manage-default-search-engines')]);
@@ -179,7 +178,7 @@ function load() {
 
 <if expr="is_win">
   PageManager.registerOverlay(
-      TriggeredResetProfileSettingsOverlay.getInstance(),
+      new ResetProfileSettingsOverlay(true),
       BrowserOptions.getInstance());
 </if>