App list sync unit tests

chrome/app/settings_strings.grdp

Index: chrome/app/settings_strings.grdp
diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp
index 92c0afb41d405b2c4d227f5b538980c40fc97f36..2640ccb2969d71097645c0c02c7947f4a99a05cf 100644
--- a/chrome/app/settings_strings.grdp
+++ b/chrome/app/settings_strings.grdp
@@ -1872,9 +1872,16 @@
   </message>
 
   <!-- Search Page -->
-  <message name="IDS_SETTINGS_SEARCH" desc="Name of the settings page which displays search engine preferences.">
-    Search engine
-  </message>
+  <if expr="chromeos">
+    <message name="IDS_SETTINGS_SEARCH" desc="Name of the settings page which displays search engine and assistant preferences on Chrome OS.">
+      Search Engine and Google Assistant
+    </message>
+  </if>
+  <if expr="not chromeos">
+    <message name="IDS_SETTINGS_SEARCH" desc="Name of the settings page which displays search engine preferences.">
+      Search Engine and Google Assistant
+    </message>
+  </if>
   <message name="IDS_SETTINGS_SEARCH_EXPLANATION" desc="Explanation for the search engine dropdown setting.">
     Search engine used in the <ph name="BEGIN_LINK">&lt;a target="_blank" href="$1"&gt;</ph>address bar<ph name="END_LINK">&lt;/a&gt;</ph>
   </message>
@@ -1909,6 +1916,15 @@
   <message name="IDS_SETTINGS_SEARCH_ENABLE_GOOGLE_NOW" desc="Label for the checkbox which enables the Google Now in the launcher.">
     Show Google Now cards in the launcher
   </message>
+  <message name="IDS_SETTINGS_SEARCH_GOOGLE_ASSISTANT" desc="Label for the Google Assistant button.">
+    Google Assistant
+  </message>
+  <message name="IDS_SETTINGS_SEARCH_GOOGLE_ASSISTANT_ENABLED" desc="Sub label for the Google Assistant button when Assistant is enabled.">
+    Enabled
+  </message>
+  <message name="IDS_SETTINGS_SEARCH_GOOGLE_ASSISTANT_DISABLED" desc="Sub label for the Google Assistant button when Assistant is disabled.">
+    Disabled
+  </message>
 
   <!-- Search Engines Page -->
   <message name="IDS_SETTINGS_SEARCH_ENGINES" desc="Name of the settings page which manages search engines.">
@@ -1954,6 +1970,26 @@
     Manage
   </message>
 
+  <!-- Google Assistant Page -->
+  <message name="IDS_SETTINGS_GOOGLE_ASSISTANT" desc="Name of the settings page for Google Assistant.">
+    Google Assistant
+  </message>
+  <message name="IDS_SETTINGS_GOOGLE_ASSISTANT_ON" desc="Label that indicates the Google Assistant is enabled.">
+    On
+  </message>
+  <message name="IDS_SETTINGS_GOOGLE_ASSISTANT_OFF" desc="Label that indicates the Google Assistant is disabled.">
+    Off
+  </message>
+  <message name="IDS_SETTINGS_GOOGLE_ASSISTANT_ENABLE_CONTEXT" desc="Title for a toggle that lets the assistant use whats on the screen.">
+    Let assistant use what's on your screen
+  </message>
+  <message name="IDS_SETTINGS_GOOGLE_ASSISTANT_ENABLE_CONTEXT_DESCRIPTION" desc="Sub label for context-enable toggle.">
+    Enables the assistant to show you related info, apps, and actions.
+  </message>
+  <message name="IDS_SETTINGS_GOOGLE_ASSISTANT_SETTINGS" desc="Title for a button that opens the Google Assistant app settings.">
+    Google Assistant settings
+  </message>
+
   <!-- Site Settings Page -->
   <message name="IDS_SETTINGS_EXCEPTIONS_EMBEDDED_ON_HOST" desc="Template text for a child row in the content Exceptions page view. Controls the permission setting for the parent page when embedded on the specified site.">
     embedded on <ph name="URL">$1<ex>www.google.com</ex></ph>