[CrOS SplitSettings] Copy and clean test_reset_browser_proxy.js for OS.

Change-Id: I79e9ef044ff60f63d388310167befb0ef7052b2d
Bug: 967907
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1706804
Commit-Queue: Regan Hsu <hsuregan@chromium.org>
Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org>
Reviewed-by: James Cook <jamescook@chromium.org>
Cr-Commit-Position: refs/heads/master@{#681099}

chrome/browser/resources/settings/chromeos/os_reset_page/BUILD.gn

@@ -7,14 +7,14 @@ import("//third_party/closure_compiler/compile_js.gni")
 js_type_check("closure_compile") {
   deps = [
     ":os_powerwash_dialog",
+    ":os_reset_browser_proxy",
     ":os_reset_page",
-    ":reset_os_proxy",
   ]
 }
 
 js_library("os_powerwash_dialog") {
   deps = [
-    ":reset_os_proxy",
+    ":os_reset_browser_proxy",
     "../..:lifetime_browser_proxy",
   ]
 }
@@ -28,7 +28,7 @@ js_library("os_reset_page") {
   ]
 }
 
-js_library("reset_os_proxy") {
+js_library("os_reset_browser_proxy") {
   deps = [
     "//ui/webui/resources/js:cr",
   ]

chrome/browser/resources/settings/chromeos/os_reset_page/os_powerwash_dialog.html

@@ -2,7 +2,7 @@
 
 <link rel="import" href="chrome://resources/cr_elements/cr_button/cr_button.html">
 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html">
-<link rel="import" href="reset_os_proxy.html">
+<link rel="import" href="os_reset_browser_proxy.html">
 <link rel="import" href="../../lifetime_browser_proxy.html">
 <link rel="import" href="../../settings_shared_css.html">
 

chrome/browser/resources/settings/chromeos/os_reset_page/os_powerwash_dialog.js

@@ -19,7 +19,7 @@ Polymer({
 
   /** @override */
   attached: function() {
-    settings.ResetOsProxyImpl.getInstance().onPowerwashDialogShow();
+    settings.OsResetBrowserProxyImpl.getInstance().onPowerwashDialogShow();
     this.$.dialog.showModal();
   },
 

chrome/browser/resources/settings/chromeos/os_reset_page/reset_os_proxy.html → chrome/browser/resources/settings/chromeos/os_reset_page/os_reset_browser_proxy.html

 <link rel="import" href="chrome://resources/html/cr.html">
-<script src="reset_os_proxy.js"></script>
+<script src="os_reset_browser_proxy.js"></script>

chrome/browser/resources/settings/chromeos/os_reset_page/reset_os_proxy.js → chrome/browser/resources/settings/chromeos/os_reset_page/os_reset_browser_proxy.js

@@ -4,22 +4,22 @@
 
 cr.define('settings', function() {
   /** @interface */
-  class ResetOsProxy {
+  class OsResetBrowserProxy {
     /**
      * A method to be called when the reset powerwash dialog is shown.
      */
     onPowerwashDialogShow() {}
 
     /**
-     * Initiates a factory reset and restarts ChromeOS.
+     * Initiates a factory reset and restarts.
      */
     requestFactoryResetRestart() {}
   }
 
   /**
-   * @implements {settings.ResetOsProxy}
+   * @implements {settings.OsResetBrowserProxy}
    */
-  class ResetOsProxyImpl {
+  class OsResetBrowserProxyImpl {
     /** @override */
     onPowerwashDialogShow() {
       chrome.send('onPowerwashDialogShow');
@@ -31,10 +31,10 @@ cr.define('settings', function() {
     }
   }
 
-  cr.addSingletonGetter(ResetOsProxyImpl);
+  cr.addSingletonGetter(OsResetBrowserProxyImpl);
 
   return {
-    ResetOsProxy: ResetOsProxy,
-    ResetOsProxyImpl: ResetOsProxyImpl,
+    OsResetBrowserProxy: OsResetBrowserProxy,
+    OsResetBrowserProxyImpl: OsResetBrowserProxyImpl,
   };
 });

chrome/browser/resources/settings/os_settings_resources.grd

@@ -468,11 +468,11 @@
       <structure name="IDR_OS_SETTINGS_RESET_PAGE_JS"
                  file="chromeos/os_reset_page/os_reset_page.js"
                  type="chrome_html" />
-      <structure name="IDR_OS_SETTINGS_RESET_OS_PROXY_JS"
-                 file="chromeos/os_reset_page/reset_os_proxy.js"
+      <structure name="IDR_OS_SETTINGS_RESET_BROWSER_PROXY_JS"
+                 file="chromeos/os_reset_page/os_reset_browser_proxy.js"
                  type="chrome_html" />
-      <structure name="IDR_OS_SETTINGS_RESET_OS_PROXY_HTML"
-                 file="chromeos/os_reset_page/reset_os_proxy.html"
+      <structure name="IDR_OS_SETTINGS_RESET_BROWSER_PROXY_HTML"
+                 file="chromeos/os_reset_page/os_reset_browser_proxy.html"
                  type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_LANGUAGES_HTML"
                  file="languages_page/languages.html"

chrome/test/data/webui/settings/chromeos/os_reset_page_test.js

@@ -23,8 +23,8 @@ cr.define('settings_reset_page', function() {
         lifetimeBrowserProxy = new settings.TestLifetimeBrowserProxy();
         settings.LifetimeBrowserProxyImpl.instance_ = lifetimeBrowserProxy;
 
-        resetPageBrowserProxy = new reset_page.TestResetBrowserProxy();
-        settings.ResetOsProxyImpl.instance_ = resetPageBrowserProxy;
+        resetPageBrowserProxy = new reset_page.TestOsResetBrowserProxy();
+        settings.OsResetBrowserProxyImpl.instance_ = resetPageBrowserProxy;
 
         PolymerTest.clearBody();
         resetPage = document.createElement('os-settings-reset-page');

chrome/test/data/webui/settings/chromeos/os_settings_browsertest.js

@@ -821,8 +821,8 @@ var OSSettingsResetPageTest = class extends OSSettingsBrowserTest {
     return super.extraLibraries.concat([
       BROWSER_SETTINGS_PATH + '../test_browser_proxy.js',
       BROWSER_SETTINGS_PATH + 'test_lifetime_browser_proxy.js',
-      BROWSER_SETTINGS_PATH + 'test_reset_browser_proxy.js',
       BROWSER_SETTINGS_PATH + 'test_util.js',
+      'test_os_reset_browser_proxy.js',
       'os_reset_page_test.js',
     ]);
   }

chrome/test/data/webui/settings/chromeos/test_os_reset_browser_proxy.js

+// Copyright 2019 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('reset_page', function() {
+  /** @implements {settings.OsResetBrowserProxy} */
+  class TestOsResetBrowserProxy extends TestBrowserProxy {
+    constructor() {
+      super([
+        'onPowerwashDialogShow',
+      ]);
+    }
+
+    /** @override */
+    onPowerwashDialogShow() {
+      this.methodCalled('onPowerwashDialogShow');
+    }
+  }
+
+  return {
+    TestOsResetBrowserProxy: TestOsResetBrowserProxy,
+  };
+});