[CrOS settings] Updated OS route path (RESET) string

Before this CL some os and browser routes had the same name. This was
a bit confusing. If a some c++ code called '/reset', it is not clear if
this url is a chrome or browser subpage. A distinction needed to be made.
This CL renames OS specific route RESET, which is shared with browser
routes to a more distinguishable name OS_RESET. Allowing this bug(990169)
to be unblocked.

Bug: 990169
Change-Id: Ia805b6889bf3b6afe0c22dfc1b11b3ea93fdb2a6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2108873Reviewed-by: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Nnamdi Theodore Johnson-kanu <tjohnsonkanu@google.com>
Cr-Commit-Position: refs/heads/master@{#755496}

chrome/browser/resources/settings/chromeos/os_route.js

@@ -127,7 +127,7 @@ cr.define('settings', function() {
     // Reset
     if (loadTimeData.valueExists('allowPowerwash') &&
         loadTimeData.getBoolean('allowPowerwash')) {
-      r.RESET = r.ADVANCED.createSection('/reset', 'reset');
+      r.OS_RESET = r.ADVANCED.createSection('/osReset', 'osReset');
     }
 
     const showAppManagement = loadTimeData.valueExists('showAppManagement') &&

chrome/browser/resources/settings/chromeos/os_settings_menu/os_settings_menu.html

@@ -268,7 +268,7 @@
               $i18n{a11yPageTitle}
             </div>
           </a>
-          <a id="reset" href="/reset" hidden="[[!showReset]]">
+          <a id="osReset" href="/osReset" hidden="[[!showReset]]">
             <div class="item">
               <iron-icon icon="settings:restore"></iron-icon>
               $i18n{resetPageTitle}

chrome/browser/resources/settings/chromeos/os_settings_page/os_settings_page.html

@@ -250,7 +250,7 @@
           </settings-section>
           <template is="dom-if" if="[[showReset]]">
             <settings-section page-title="$i18n{resetPageTitle}"
-                section="reset">
+                section="osReset">
               <os-settings-reset-page></os-settings-reset-page>
             </settings-section>
           </template>

chrome/browser/resources/settings/chromeos/os_settings_routes.js

@@ -53,6 +53,7 @@
  *   MULTIDEVICE: !settings.Route,
  *   MULTIDEVICE_FEATURES: !settings.Route,
  *   NETWORK_DETAIL: !settings.Route,
+ *   OS_RESET: !settings.Route,
  *   OS_SYNC: !settings.Route,
  *   PEOPLE: !settings.Route,
  *   PERSONALIZATION: !settings.Route,
@@ -63,7 +64,6 @@
  *   POWER: !settings.Route,
  *   PRINTING: !settings.Route,
  *   PRIVACY: !settings.Route,
- *   RESET: !settings.Route,
  *   SEARCH: !settings.Route,
  *   SIGN_OUT: !settings.Route,
  *   SMART_LOCK: !settings.Route,

chrome/browser/ui/ash/chrome_new_window_client.cc

@@ -114,9 +114,9 @@ constexpr std::pair<arc::mojom::ChromePage, const char*> kOSSettingsMapping[] =
      {ChromePage::NETWORKSTYPEVPN, chrome::kVPNSettingsSubPage},
      {ChromePage::PLUGINVMDETAILS, chrome::kPluginVmDetailsSubPage},
      {ChromePage::PLUGINVMSHAREDPATHS, chrome::kPluginVmSharedPathsSubPage},
+     {ChromePage::OSRESET, chrome::kOsResetSubPage},
      {ChromePage::POINTEROVERLAY, chrome::kPointerOverlaySubPage},
      {ChromePage::POWER, chrome::kPowerSubPage},
-     {ChromePage::RESET, chrome::kResetSubPage},
      {ChromePage::SMARTLOCKSETTINGS, chrome::kSmartLockSettingsSubPage},
      {ChromePage::STORAGE, chrome::kStorageSubPage},
      {ChromePage::STYLUS, chrome::kStylusSubPage},
@@ -134,6 +134,7 @@ constexpr std::pair<arc::mojom::ChromePage, const char*>
         {ChromePage::ONSTARTUP, chrome::kOnStartupSubPage},
         {ChromePage::PASSWORDS, chrome::kPasswordManagerSubPage},
         {ChromePage::PRIVACY, chrome::kPrivacySubPage},
+        {ChromePage::RESET, chrome::kResetSubPage},
         {ChromePage::SEARCH, chrome::kSearchSubPage},
         {ChromePage::SYNCSETUP, chrome::kSyncSetupSubPage}};
 

chrome/browser/ui/ash/chrome_new_window_client_browsertest.cc

@@ -278,8 +278,8 @@ void TestAllOSSettingPages(const GURL& base_url) {
                      base_url.Resolve(chrome::kVPNSettingsSubPage));
   TestOpenChromePage(ChromePage::POINTEROVERLAY,
                      base_url.Resolve(chrome::kPointerOverlaySubPage));
-  TestOpenChromePage(ChromePage::RESET,
-                     base_url.Resolve(chrome::kResetSubPage));
+  TestOpenChromePage(ChromePage::OSRESET,
+                     base_url.Resolve(chrome::kOsResetSubPage));
   TestOpenChromePage(ChromePage::STORAGE,
                      base_url.Resolve(chrome::kStorageSubPage));
   TestOpenChromePage(ChromePage::ACCESSIBILITY,
@@ -353,6 +353,8 @@ void TestAllBrowserSettingPages(const GURL& base_url) {
                      base_url.Resolve(chrome::kOnStartupSubPage));
   TestOpenChromePage(ChromePage::PASSWORDS,
                      base_url.Resolve(chrome::kPasswordManagerSubPage));
+  TestOpenChromePage(ChromePage::RESET,
+                     base_url.Resolve(chrome::kResetSubPage));
   TestOpenChromePage(ChromePage::SEARCH,
                      base_url.Resolve(chrome::kSearchSubPage));
   TestOpenChromePage(ChromePage::SYNCSETUP,

chrome/common/webui_url_constants.cc

@@ -379,6 +379,7 @@ const char kPasswordManagerSubPage[] = "passwords";
 const char kPaymentsSubPage[] = "payments";
 const char kPrintingSettingsSubPage[] = "printing";
 const char kPrivacySubPage[] = "privacy";
+const char kResetSubPage[] = "reset";
 const char kResetProfileSettingsSubPage[] = "resetProfileSettings";
 const char kSearchSubPage[] = "search";
 const char kSearchEnginesSubPage[] = "searchEngines";
@@ -423,11 +424,11 @@ const char kMultideviceSubPage[] = "multidevice";
 const char kNativePrintingSettingsSubPage[] = "cupsPrinters";
 const char kNetworkDetailSubPage[] = "networkDetail";
 const char kNetworksSubPage[] = "networks";
+const char kOsResetSubPage[] = "osReset";
 const char kPluginVmDetailsSubPage[] = "pluginVm/details";
 const char kPluginVmSharedPathsSubPage[] = "pluginVm/sharedPaths";
 const char kPointerOverlaySubPage[] = "pointer-overlay";
 const char kPowerSubPage[] = "power";
-const char kResetSubPage[] = "reset";
 const char kSmartLockSettingsSubPage[] = "multidevice/features/smartLock";
 const char kSmbSharesSubPage[] = "smbShares";
 const char kStorageSubPage[] = "storage";
@@ -480,10 +481,9 @@ bool IsOSSettingsSubPage(const std::string& sub_page) {
       kNetworksSubPage,
       kPluginVmDetailsSubPage,
       kPluginVmSharedPathsSubPage,
+      kOsResetSubPage,
       kPointerOverlaySubPage,
       kPowerSubPage,
-      // reset is both an OS and browser sub page, but prefer the OS version
-      kResetSubPage,
       kSmartLockSettingsSubPage,
       kSmbSharesSubPage,
       kStorageSubPage,

chrome/common/webui_url_constants.h

@@ -336,6 +336,7 @@ extern const char kPaymentsSubPage[];
 extern const char kPeopleSubPage[];
 extern const char kPrintingSettingsSubPage[];
 extern const char kPrivacySubPage[];
+extern const char kResetSubPage[];
 extern const char kResetProfileSettingsSubPage[];
 extern const char kSearchSubPage[];
 extern const char kSearchEnginesSubPage[];
@@ -377,11 +378,11 @@ extern const char kMultideviceSubPage[];
 extern const char kNativePrintingSettingsSubPage[];
 extern const char kNetworkDetailSubPage[];
 extern const char kNetworksSubPage[];
+extern const char kOsResetSubPage[];
 extern const char kPluginVmDetailsSubPage[];
 extern const char kPluginVmSharedPathsSubPage[];
 extern const char kPointerOverlaySubPage[];
 extern const char kPowerSubPage[];
-extern const char kResetSubPage[];
 extern const char kSmartLockSettingsSubPage[];
 extern const char kSmbSharesSubPage[];
 extern const char kStorageSubPage[];

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

@@ -10,7 +10,7 @@ function setupRouter() {
     ADVANCED: new settings.Route('/advanced'),
   };
   routes.BLUETOOTH = routes.BASIC.createSection('/bluetooth', 'bluetooth');
-  routes.RESET = routes.ADVANCED.createSection('/reset', 'reset');
+  routes.RESET = routes.ADVANCED.createSection('/osReset', 'osReset');
 
   settings.Router.resetInstanceForTesting(new settings.Router(routes));
   settings.routes = routes;
@@ -90,13 +90,13 @@ suite('OSSettingsMenuReset', function() {
   test('openResetSection', function() {
     const selector = settingsMenu.$.subMenu;
     const path = new window.URL(selector.selected).pathname;
-    assertEquals('/reset', path);
+    assertEquals('/osReset', path);
   });
 
   test('navigateToAnotherSection', function() {
     const selector = settingsMenu.$.subMenu;
     let path = new window.URL(selector.selected).pathname;
-    assertEquals('/reset', path);
+    assertEquals('/osReset', path);
 
     settings.Router.getInstance().navigateTo(settings.routes.BLUETOOTH, '');
     Polymer.dom.flush();
@@ -108,7 +108,7 @@ suite('OSSettingsMenuReset', function() {
   test('navigateToBasic', function() {
     const selector = settingsMenu.$.subMenu;
     const path = new window.URL(selector.selected).pathname;
-    assertEquals('/reset', path);
+    assertEquals('/osReset', path);
 
     settings.Router.getInstance().navigateTo(settings.routes.BASIC, '');
     Polymer.dom.flush();

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

@@ -85,7 +85,7 @@ suite('OSSettingsPage', function() {
     await test_util.flushTasks();
 
     const sectionNames =
-        ['privacy', 'languages', 'files', 'reset', 'dateTime', 'a11y'];
+        ['privacy', 'languages', 'files', 'osReset', 'dateTime', 'a11y'];
 
     for (const name of sectionNames) {
       const section = settingsPage.shadowRoot.querySelector(
@@ -113,7 +113,7 @@ suite('OSSettingsPage', function() {
 
     const visibleSections = [
       'internet', 'bluetooth', 'device', 'search', 'apps', 'privacy',
-      'languages', 'files', 'reset', 'dateTime', 'a11y'
+      'languages', 'files', 'osReset', 'dateTime', 'a11y'
     ];
     for (const name of visibleSections) {
       const section = settingsPage.shadowRoot.querySelector(

components/arc/mojom/intent_helper.mojom

@@ -173,8 +173,9 @@ enum ChromePage {
   AMBIENTMODE,
   PLUGINVMDETAILS,
   PLUGINVMSHAREDPATHS,
+  OSRESET,
 
-  LAST = PLUGINVMSHAREDPATHS,
+  LAST = OSRESET,
 };
 
 // Describes an unique chrome app.