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

Before this CL some os and browser routes had the same name. This was
a bit confusing. If some c++ code called the route '/privacy', 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 PRIVACY, which
is shared with browser routes to a more distinguishable name
OS_PRIVACY. Allowing this bug(990169) to be unblocked.

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

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

@@ -97,7 +97,7 @@ cr.define('settings', function() {
 
     r.ADVANCED = new settings.Route('/advanced');
 
-    r.PRIVACY = r.ADVANCED.createSection('/privacy', 'privacy');
+    r.OS_PRIVACY = r.ADVANCED.createSection('/osPrivacy', 'osPrivacy');
 
     // Languages and input
     r.OS_LANGUAGES = r.ADVANCED.createSection('/osLanguages', 'osLanguages');

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

@@ -238,7 +238,7 @@
               $i18n{dateTimePageTitle}
             </div>
           </a>
-          <a href="/privacy">
+          <a href="/osPrivacy">
             <div class="item">
               <iron-icon icon="cr:security"></iron-icon>
               $i18n{privacyPageTitle}

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

@@ -222,7 +222,7 @@
             </settings-date-time-page>
           </settings-section>
           <settings-section page-title="$i18n{privacyPageTitle}"
-              section="privacy">
+              section="osPrivacy">
             <os-settings-privacy-page prefs="{{prefs}}">
             </os-settings-privacy-page>
           </settings-section>

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

@@ -54,6 +54,7 @@
  *   OS_LANGUAGES_DETAILS: !settings.Route,
  *   OS_LANGUAGES_INPUT_METHODS: !settings.Route,
  *   OS_PRINTING: !settings.Route,
+ *   OS_PRIVACY: !settings.Route,
  *   OS_RESET: !settings.Route,
  *   OS_SEARCH: !settings.Route,
  *   OS_SYNC: !settings.Route,
@@ -66,7 +67,6 @@
  *   POWER: !settings.Route,
  *   PRIVACY: !settings.Route,
  *   SEARCH: !settings.Route,
- *   RESET: !settings.Route,
  *   SIGN_OUT: !settings.Route,
  *   SMART_LOCK: !settings.Route,
  *   SMB_SHARES: !settings.Route,

chrome/browser/ui/ash/chrome_new_window_client.cc

@@ -121,6 +121,7 @@ constexpr std::pair<arc::mojom::ChromePage, const char*> kOSSettingsMapping[] =
      {ChromePage::PLUGINVMSHAREDPATHS, chrome::kPluginVmSharedPathsSubPage},
      {ChromePage::OSACCESSIBILITY, chrome::kOsAccessibilitySubPage},
      {ChromePage::OSPRINTING, chrome::kOsPrintingSubPage},
+     {ChromePage::OSPRIVACY, chrome::kOsPrivacySubPage},
      {ChromePage::OSRESET, chrome::kOsResetSubPage},
      {ChromePage::OSSEARCH, chrome::kOsSearchSubPage},
      {ChromePage::POINTEROVERLAY, chrome::kPointerOverlaySubPage},

chrome/browser/ui/ash/chrome_new_window_client_browsertest.cc

@@ -330,6 +330,8 @@ void TestAllOSSettingPages(const GURL& base_url) {
                      base_url.Resolve(chrome::kPluginVmSharedPathsSubPage));
   TestOpenChromePage(ChromePage::OSSEARCH,
                      base_url.Resolve(chrome::kOsSearchSubPage));
+  TestOpenChromePage(ChromePage::OSPRIVACY,
+                     base_url.Resolve(chrome::kOsPrivacySubPage));
   TestOpenChromePage(ChromePage::SMARTLOCKSETTINGS,
                      base_url.Resolve(chrome::kSmartLockSettingsSubPage));
   TestOpenChromePage(ChromePage::STYLUS,

chrome/common/webui_url_constants.cc

@@ -430,6 +430,7 @@ const char kNetworkDetailSubPage[] = "networkDetail";
 const char kNetworksSubPage[] = "networks";
 const char kOsAccessibilitySubPage[] = "osAccessibility";
 const char kOsPrintingSubPage[] = "osPrinting";
+const char kOsPrivacySubPage[] = "osPrivacy";
 const char kOsResetSubPage[] = "osReset";
 const char kOsSearchSubPage[] = "osSearch";
 const char kPluginVmDetailsSubPage[] = "pluginVm/details";
@@ -490,6 +491,7 @@ bool IsOSSettingsSubPage(const std::string& sub_page) {
       kOsLanguagesDetailsSubPage,
       kOsLanguagesInputMethodsSubPage,
       kOsPrintingSubPage,
+      kOsPrivacySubPage,
       kOsResetSubPage,
       kOsSearchSubPage,
       kPointerOverlaySubPage,

chrome/common/webui_url_constants.h

@@ -390,6 +390,7 @@ extern const char kOsLanguagesSubPage[];
 extern const char kOsLanguagesDetailsSubPage[];
 extern const char kOsLanguagesInputMethodsSubPage[];
 extern const char kOsPrintingSubPage[];
+extern const char kOsPrivacySubPage[];
 extern const char kOsResetSubPage[];
 extern const char kOsSearchSubPage[];
 extern const char kPluginVmDetailsSubPage[];

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', 'osLanguages', 'files', 'osReset', 'dateTime', 'a11y'];
+        ['osPrivacy', 'osLanguages', 'files', 'osReset', 'dateTime', 'a11y'];
 
     for (const name of sectionNames) {
       const section = settingsPage.shadowRoot.querySelector(
@@ -112,7 +112,7 @@ suite('OSSettingsPage', function() {
     }
 
     const visibleSections = [
-      'internet', 'bluetooth', 'device', 'osSearch', 'apps', 'privacy',
+      'internet', 'bluetooth', 'device', 'osSearch', 'apps', 'osPrivacy',
       'osLanguages', 'files', 'osReset', 'dateTime', 'a11y'
     ];
     for (const name of visibleSections) {

components/arc/mojom/intent_helper.mojom

@@ -179,6 +179,7 @@ enum ChromePage {
   OSLANGUAGESINPUTMETHODS,
   OSPRINTING,
   PRINTING,
+  OSPRIVACY,
   OSSEARCH,
   OSRESET,