Delete the old hotwording integration.

chrome/browser/ui/webui/options/browser_options_handler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/options/browser_options_handler.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 1765 matching lines @@
   // checks it.
   if (HotwordServiceFactory::IsHotwordAllowed(profile)) {
     // Update the current error value.
     HotwordServiceFactory::IsServiceAvailable(profile);
     int error = HotwordServiceFactory::GetCurrentError(profile);
 
     std::string function_name;
     bool always_on = false;
     SigninManagerBase* signin = SigninManagerFactory::GetForProfile(profile);
     bool authenticated = signin && signin->IsAuthenticated();
-    if (HotwordService::IsExperimentalHotwordingEnabled()) {
-      if (HotwordServiceFactory::IsAlwaysOnAvailable() &&
-          authenticated) {
-        function_name = "BrowserOptions.showHotwordAlwaysOnSection";
-        always_on = true;
-        // Show the retrain link if always-on is enabled.
-        if (profile->GetPrefs()->GetBoolean(
-                prefs::kHotwordAlwaysOnSearchEnabled)) {
-          web_ui()->CallJavascriptFunction(
-              "BrowserOptions.setHotwordRetrainLinkVisible",
-              base::FundamentalValue(true));
-        }
-      } else {
-        function_name = "BrowserOptions.showHotwordNoDspSection";
+    if (HotwordServiceFactory::IsAlwaysOnAvailable() && authenticated) {
+      function_name = "BrowserOptions.showHotwordAlwaysOnSection";
+      always_on = true;
+      // Show the retrain link if always-on is enabled.
+      if (profile->GetPrefs()->GetBoolean(
+              prefs::kHotwordAlwaysOnSearchEnabled)) {
+        web_ui()->CallJavascriptFunction(
+            "BrowserOptions.setHotwordRetrainLinkVisible",
+            base::FundamentalValue(true));
       }
     } else {
-      function_name = "BrowserOptions.showHotwordSection";
+      function_name = "BrowserOptions.showHotwordNoDspSection";
     }
 
     // Audio history should be displayed if it's enabled regardless of the
     // hotword error state if the user is signed in. If the user is not signed
     // in, audio history is meaningless. This is only displayed if always-on
     // hotwording is available.
-    if (HotwordService::IsExperimentalHotwordingEnabled() &&
-        authenticated && always_on) {
+    if (authenticated && always_on) {
       std::string user_display_name = signin->GetAuthenticatedUsername();
       DCHECK(!user_display_name.empty());
       base::string16 audio_history_state =
           l10n_util::GetStringFUTF16(IDS_HOTWORD_AUDIO_HISTORY_ENABLED,
           base::ASCIIToUTF16(user_display_name));
       HotwordService* hotword_service =
           HotwordServiceFactory::GetForProfile(profile);
       if (hotword_service) {
         hotword_service->GetAudioHistoryHandler()->GetAudioHistoryEnabled(
             base::Bind(
@@ skipping 352 matching lines @@
 void BrowserOptionsHandler::OnPolicyUpdated(const policy::PolicyNamespace& ns,
                                             const policy::PolicyMap& previous,
                                             const policy::PolicyMap& current) {
   std::set<std::string> different_keys;
   current.GetDifferingKeys(previous, &different_keys);
   if (ContainsKey(different_keys, policy::key::kMetricsReportingEnabled))
     SetupMetricsReportingCheckbox();
 }
 
 }  // namespace options