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

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

Bug: 990169
Change-Id: If1528c70ed31429711044985e9589a6025568dfc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2117936
Commit-Queue: Nnamdi Theodore Johnson-kanu <tjohnsonkanu@google.com>
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#756571}

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

@@ -69,7 +69,7 @@
       }
 
     </style>
-    <settings-animated-pages id="pages" section="people"
+    <settings-animated-pages id="pages" section="osPeople"
         focus-config="[[focusConfig_]]">
       <div route-path="default">
         <div class="settings-box first two-line">

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

@@ -19,8 +19,8 @@ cr.define('settings', function() {
 
     r.OS_SEARCH = r.BASIC.createSection('/osSearch', 'osSearch');
     if (!loadTimeData.getBoolean('isGuest')) {
-      r.PEOPLE = r.BASIC.createSection('/people', 'people');
-      r.SYNC = r.PEOPLE.createChild('/syncSetup');
+      r.OS_PEOPLE = r.BASIC.createSection('/osPeople', 'osPeople');
+      r.SYNC = r.OS_PEOPLE.createChild('/syncSetup');
       if (!loadTimeData.getBoolean('splitSettingsSyncEnabled')) {
         r.SYNC_ADVANCED = r.SYNC.createChild('/syncSetup/advanced');
       }
@@ -55,10 +55,10 @@ cr.define('settings', function() {
       r.SMART_LOCK =
           r.MULTIDEVICE_FEATURES.createChild('/multidevice/features/smartLock');
 
-      r.ACCOUNTS = r.PEOPLE.createChild('/accounts');
-      r.ACCOUNT_MANAGER = r.PEOPLE.createChild('/accountManager');
-      r.KERBEROS_ACCOUNTS = r.PEOPLE.createChild('/kerberosAccounts');
-      r.LOCK_SCREEN = r.PEOPLE.createChild('/lockScreen');
+      r.ACCOUNTS = r.OS_PEOPLE.createChild('/accounts');
+      r.ACCOUNT_MANAGER = r.OS_PEOPLE.createChild('/accountManager');
+      r.KERBEROS_ACCOUNTS = r.OS_PEOPLE.createChild('/kerberosAccounts');
+      r.LOCK_SCREEN = r.OS_PEOPLE.createChild('/lockScreen');
       r.FINGERPRINT = r.LOCK_SCREEN.createChild('/lockScreen/fingerprint');
     }
 
@@ -111,7 +111,7 @@ cr.define('settings', function() {
 
     if (!loadTimeData.getBoolean('isGuest')) {
       if (loadTimeData.getBoolean('splitSettingsSyncEnabled')) {
-        r.OS_SYNC = r.PEOPLE.createChild('/osSync');
+        r.OS_SYNC = r.OS_PEOPLE.createChild('/osSync');
       }
       // Personalization
       r.PERSONALIZATION =

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

@@ -179,7 +179,7 @@
           $i18n{multidevicePageTitle}
         </div>
       </a>
-      <a id="people" href="/people" hidden="[[isGuestMode_]]">
+      <a id="osPeople" href="/osPeople" hidden="[[isGuestMode_]]">
         <div class="item">
           <iron-icon icon="cr:person"></iron-icon>
           $i18n{osPeoplePageTitle}

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

@@ -144,7 +144,7 @@
         </template>
         <template is="dom-if" if="[[!isGuestMode_]]" restamp>
           <settings-section page-title="$i18n{osPeoplePageTitle}"
-              section="people">
+              section="osPeople">
             <os-settings-people-page prefs="{{prefs}}"
                 page-visibility="[[pageVisibility]]">
             </os-settings-people-page>

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

@@ -58,7 +58,7 @@
  *   OS_RESET: !settings.Route,
  *   OS_SEARCH: !settings.Route,
  *   OS_SYNC: !settings.Route,
- *   PEOPLE: !settings.Route,
+ *   OS_PEOPLE: !settings.Route,
  *   PERSONALIZATION: !settings.Route,
  *   PLUGIN_VM: !settings.Route,
  *   PLUGIN_VM_DETAILS: !settings.Route,

chrome/browser/resources/settings/people_page/BUILD.gn

@@ -104,7 +104,7 @@ js_library("sync_page") {
     ":sync_browser_proxy",
     ":sync_encryption_options",
     "..:page_visibility",
-    "..:router",
+    "..:route",
     "../settings_page:settings_animated_pages",
     "//ui/webui/resources/cr_elements/cr_expand_button:cr_expand_button",
     "//ui/webui/resources/cr_elements/cr_input:cr_input",

chrome/browser/ui/ash/chrome_new_window_client.cc

@@ -120,6 +120,7 @@ constexpr std::pair<arc::mojom::ChromePage, const char*> kOSSettingsMapping[] =
      {ChromePage::PLUGINVMDETAILS, chrome::kPluginVmDetailsSubPage},
      {ChromePage::PLUGINVMSHAREDPATHS, chrome::kPluginVmSharedPathsSubPage},
      {ChromePage::OSACCESSIBILITY, chrome::kOsAccessibilitySubPage},
+     {ChromePage::OSPEOPLE, chrome::kOsPeopleSubPage},
      {ChromePage::OSPRINTING, chrome::kOsPrintingSubPage},
      {ChromePage::OSPRIVACY, chrome::kOsPrivacySubPage},
      {ChromePage::OSRESET, chrome::kOsResetSubPage},

chrome/browser/ui/ash/chrome_new_window_client_browsertest.cc

@@ -280,6 +280,8 @@ void TestAllOSSettingPages(const GURL& base_url) {
                      base_url.Resolve(chrome::kManageAccessibilitySubPage));
   TestOpenChromePage(ChromePage::NETWORKSTYPEVPN,
                      base_url.Resolve(chrome::kVPNSettingsSubPage));
+  TestOpenChromePage(ChromePage::OSPEOPLE,
+                     base_url.Resolve(chrome::kOsPeopleSubPage));
   TestOpenChromePage(ChromePage::OSPRINTING,
                      base_url.Resolve(chrome::kOsPrintingSubPage));
   TestOpenChromePage(ChromePage::POINTEROVERLAY,

chrome/common/webui_url_constants.cc

@@ -429,6 +429,7 @@ const char kNativePrintingSettingsSubPage[] = "cupsPrinters";
 const char kNetworkDetailSubPage[] = "networkDetail";
 const char kNetworksSubPage[] = "networks";
 const char kOsAccessibilitySubPage[] = "osAccessibility";
+const char kOsPeopleSubPage[] = "osPeople";
 const char kOsPrintingSubPage[] = "osPrinting";
 const char kOsPrivacySubPage[] = "osPrivacy";
 const char kOsResetSubPage[] = "osReset";
@@ -490,6 +491,7 @@ bool IsOSSettingsSubPage(const std::string& sub_page) {
       kOsLanguagesSubPage,
       kOsLanguagesDetailsSubPage,
       kOsLanguagesInputMethodsSubPage,
+      kOsPeopleSubPage,
       kOsPrintingSubPage,
       kOsPrivacySubPage,
       kOsResetSubPage,

chrome/common/webui_url_constants.h

@@ -389,6 +389,7 @@ extern const char kOsAccessibilitySubPage[];
 extern const char kOsLanguagesSubPage[];
 extern const char kOsLanguagesDetailsSubPage[];
 extern const char kOsLanguagesInputMethodsSubPage[];
+extern const char kOsPeopleSubPage[];
 extern const char kOsPrintingSubPage[];
 extern const char kOsPrivacySubPage[];
 extern const char kOsResetSubPage[];

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

@@ -66,7 +66,7 @@ suite('OSSettingsPage', function() {
 
   test('Basic sections', function() {
     const sectionNames = [
-      'internet', 'bluetooth', 'multidevice', 'people', 'device',
+      'internet', 'bluetooth', 'multidevice', 'osPeople', 'device',
       'personalization', 'osSearch', 'apps'
     ];
 
@@ -104,7 +104,7 @@ suite('OSSettingsPage', function() {
     Polymer.dom.flush();
     await test_util.flushTasks();
 
-    const hiddenSections = ['multidevice', 'people', 'personalization'];
+    const hiddenSections = ['multidevice', 'osPeople', 'personalization'];
     for (const name of hiddenSections) {
       const section = settingsPage.shadowRoot.querySelector(
           `settings-section[section=${name}]`);

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

@@ -240,7 +240,7 @@ TEST_F('OSSettingsUIBrowserTest', 'AllJsTests', () => {
       assertEquals(
           urlParams.toString(),
           settings.Router.getInstance().getQueryParameters().toString());
-      settingsMenu.$.people.click();
+      settingsMenu.$.osPeople.click();
       assertEquals(
           '', settings.Router.getInstance().getQueryParameters().toString());
     });

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

@@ -303,7 +303,7 @@ suite('OsSyncControlsNavigationTest', function() {
     settings.Router.getInstance().navigateTo(settings.routes.OS_SYNC);
     await browserProxy.methodCalled('didNavigateToOsSyncPage');
 
-    settings.Router.getInstance().navigateTo(settings.routes.PEOPLE);
+    settings.Router.getInstance().navigateTo(settings.routes.OS_PEOPLE);
     await browserProxy.methodCalled('didNavigateAwayFromOsSyncPage');
   });
 });

components/arc/mojom/intent_helper.mojom

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