App list sync unit tests

chrome/browser/resources/settings/search_page/search_page.html

Index: chrome/browser/resources/settings/search_page/search_page.html
diff --git a/chrome/browser/resources/settings/search_page/search_page.html b/chrome/browser/resources/settings/search_page/search_page.html
index 0aed8e79cf0348a95f99ee59185b2b858dcb6a7d..11f4d795cd34144c6d3d54525351a74d5ebfb549 100644
--- a/chrome/browser/resources/settings/search_page/search_page.html
+++ b/chrome/browser/resources/settings/search_page/search_page.html
@@ -8,6 +8,8 @@
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper-icon-button-light.html">
 <link rel="import" href="../controls/extension_controlled_indicator.html">
 <link rel="import" href="../controls/settings_toggle_button.html">
+<link rel="import" href="../google_assistant_page/google_assistant_page.html">
+<link rel="import" href="../google_assistant_page/google_assistant_browser_proxy.html">
 <link rel="import" href="../icons.html">
 <link rel="import" href="../i18n_setup.html">
 <link rel="import" href="../route.html">
@@ -143,6 +145,24 @@
           <button class="subpage-arrow" is="paper-icon-button-light"
               aria-label="$i18n{searchEnginesManage}"></button>
         </div>
+
+<if expr="chromeos">
+        <!-- Google Assistant -->
+        <template is="dom-if" if="[[voiceInteractionFeatureEnabled_]]">
+           <div id="subpage-trigger" class="settings-box two-line"
+              on-tap="onGoogleAssistantTap_" actionable>
+            <div class="start">
+              $i18n{searchGoogleAssistant}
+              <div class="secondary" id="googleAssistantSecondary">
+                [[getAssistantEnabledDisabledLabel_(
+                    prefs.settings.voice_interaction.enabled.value)]]
+              </div>
+            </div>
+            <button class="subpage-arrow" is="paper-icon-button-light"
+              aria-label="$i18n{searchEnginesManage}"></button>
+          </div>
+        </template>
+</if>
       </neon-animatable>
       <template is="dom-if" route-path="/searchEngines">
         <settings-subpage
@@ -151,6 +171,18 @@
           <settings-search-engines-page></settings-search-engines-page>
         </settings-subpage>
       </template>
+<if expr="chromeos">
+      <template is="dom-if" if="[[voiceInteractionFeatureEnabled_]]">
+        <template is="dom-if" route-path="/googleAssistant">
+          <settings-subpage
+              associated-control="[[$$('#subpage-trigger')]]"
+              page-title="$i18n{googleAssistantPageTitle}">
+            <settings-google-assistant-page prefs="{{prefs}}">
+            </settings-google-assistant-page>
+          </settings-subpage>
+        </template>
+      </template>
+</if>
     </settings-animated-pages>
   </template>
   <script src="search_page.js"></script>