[CrOS settings] Updated OS route path (SEARCH) 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 '/search', 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 SEARCH, which
is shared with browser routes to a more distinguishable name
OS_SEARCH. Allowing this bug(990169) to be unblocked.

Bug: 990169
Change-Id: I9f87f1d3d289c4dc31847cbab4c83e90cb47c16a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2128092
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@{#756025}

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

@@ -17,7 +17,7 @@ cr.define('settings', function() {
     r.SIGN_OUT = r.BASIC.createChild('/signOut');
     r.SIGN_OUT.isNavigableDialog = true;
 
-    r.SEARCH = r.BASIC.createSection('/search', 'search');
+    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');
@@ -93,7 +93,7 @@ cr.define('settings', function() {
           r.PLUGIN_VM.createChild('/pluginVm/sharedPaths');
     }
 
-    r.GOOGLE_ASSISTANT = r.SEARCH.createChild('/googleAssistant');
+    r.GOOGLE_ASSISTANT = r.OS_SEARCH.createChild('/googleAssistant');
 
     r.ADVANCED = new settings.Route('/advanced');
 

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

@@ -198,7 +198,7 @@
           $i18n{personalizationPageTitle}
         </div>
       </a>
-      <a href="/search">
+      <a href="/osSearch">
         <div class="item">
           <iron-icon icon="cr:search"></iron-icon>
           $i18n{osSearchPageTitle}

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

@@ -164,7 +164,7 @@
           </settings-section>
         </template>
         <settings-section page-title="$i18n{osSearchPageTitle}"
-            section="search">
+            section="osSearch">
           <os-settings-search-page prefs="{{prefs}}">
           </os-settings-search-page>
         </settings-section>

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

@@ -54,6 +54,7 @@
  *   NETWORK_DETAIL: !settings.Route,
  *   OS_ACCESSIBILITY: !settings.Route,
  *   OS_RESET: !settings.Route,
+ *   OS_SEARCH: !settings.Route,
  *   OS_SYNC: !settings.Route,
  *   PEOPLE: !settings.Route,
  *   PERSONALIZATION: !settings.Route,
@@ -65,6 +66,7 @@
  *   PRINTING: !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

@@ -119,6 +119,7 @@ constexpr std::pair<arc::mojom::ChromePage, const char*> kOSSettingsMapping[] =
      {ChromePage::PLUGINVMSHAREDPATHS, chrome::kPluginVmSharedPathsSubPage},
      {ChromePage::OSACCESSIBILITY, chrome::kOsAccessibilitySubPage},
      {ChromePage::OSRESET, chrome::kOsResetSubPage},
+     {ChromePage::OSSEARCH, chrome::kOsSearchSubPage},
      {ChromePage::POINTEROVERLAY, chrome::kPointerOverlaySubPage},
      {ChromePage::POWER, chrome::kPowerSubPage},
      {ChromePage::SMARTLOCKSETTINGS, chrome::kSmartLockSettingsSubPage},

chrome/browser/ui/ash/chrome_new_window_client_browsertest.cc

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

chrome/common/webui_url_constants.cc

@@ -427,6 +427,7 @@ const char kNetworkDetailSubPage[] = "networkDetail";
 const char kNetworksSubPage[] = "networks";
 const char kOsAccessibilitySubPage[] = "osAccessibility";
 const char kOsResetSubPage[] = "osReset";
+const char kOsSearchSubPage[] = "osSearch";
 const char kPluginVmDetailsSubPage[] = "pluginVm/details";
 const char kPluginVmSharedPathsSubPage[] = "pluginVm/sharedPaths";
 const char kPointerOverlaySubPage[] = "pointer-overlay";
@@ -484,6 +485,7 @@ bool IsOSSettingsSubPage(const std::string& sub_page) {
       kPluginVmSharedPathsSubPage,
       kOsAccessibilitySubPage,
       kOsResetSubPage,
+      kOsSearchSubPage,
       kPointerOverlaySubPage,
       kPowerSubPage,
       kSmartLockSettingsSubPage,

chrome/common/webui_url_constants.h

@@ -387,6 +387,7 @@ extern const char kNetworkDetailSubPage[];
 extern const char kNetworksSubPage[];
 extern const char kOsAccessibilitySubPage[];
 extern const char kOsResetSubPage[];
+extern const char kOsSearchSubPage[];
 extern const char kPluginVmDetailsSubPage[];
 extern const char kPluginVmSharedPathsSubPage[];
 extern const char kPointerOverlaySubPage[];

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

@@ -67,7 +67,7 @@ suite('OSSettingsPage', function() {
   test('Basic sections', function() {
     const sectionNames = [
       'internet', 'bluetooth', 'multidevice', 'people', 'device',
-      'personalization', 'search', 'apps'
+      'personalization', 'osSearch', 'apps'
     ];
 
     for (const name of sectionNames) {
@@ -112,7 +112,7 @@ suite('OSSettingsPage', function() {
     }
 
     const visibleSections = [
-      'internet', 'bluetooth', 'device', 'search', 'apps', 'privacy',
+      'internet', 'bluetooth', 'device', 'osSearch', 'apps', 'privacy',
       'languages', 'files', 'osReset', 'dateTime', 'a11y'
     ];
     for (const name of visibleSections) {

components/arc/mojom/intent_helper.mojom

@@ -175,8 +175,9 @@ enum ChromePage {
   PLUGINVMSHAREDPATHS,
   OSRESET,
   OSACCESSIBILITY,
+  OSSEARCH,
 
-  LAST = OSACCESSIBILITY,
+  LAST = OSSEARCH,
 };
 
 // Describes an unique chrome app.