Disable old hotword extension when new hotwording is enabled.

chrome/browser/search/hotword_service.cc

 // Copyright 2013 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/search/hotword_service.h"
 
 #include "base/command_line.h"
 #include "base/i18n/case_conversion.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
@@ skipping 176 matching lines @@
     : profile_(profile),
       extension_registry_observer_(this),
       client_(NULL),
       error_message_(0),
       reinstall_pending_(false),
       weak_factory_(this) {
   extension_registry_observer_.Add(extensions::ExtensionRegistry::Get(profile));
   // This will be called during profile initialization which is a good time
   // to check the user's hotword state.
   HotwordEnabled enabled_state = UNSET;
-  if (profile_->GetPrefs()->HasPrefPath(prefs::kHotwordSearchEnabled)) {
-    if (profile_->GetPrefs()->GetBoolean(prefs::kHotwordSearchEnabled))
-      enabled_state = ENABLED;
-    else
-      enabled_state = DISABLED;
+  if (IsExperimentalHotwordingEnabled()) {
+    // Disable the old extension so it doesn't interfere with the new stuff.
+    DisableHotwordExtension(GetExtensionService(profile_));
   } else {
-    // If the preference has not been set the hotword extension should
-    // not be running. However, this should only be done if auto-install
-    // is enabled which is gated through the IsHotwordAllowed check.
-    if (IsHotwordAllowed())
-      DisableHotwordExtension(GetExtensionService(profile_));
+    if (profile_->GetPrefs()->HasPrefPath(prefs::kHotwordSearchEnabled)) {
+      if (profile_->GetPrefs()->GetBoolean(prefs::kHotwordSearchEnabled))
+        enabled_state = ENABLED;
+      else
+        enabled_state = DISABLED;
+    } else {
+      // If the preference has not been set the hotword extension should
+      // not be running. However, this should only be done if auto-install
+      // is enabled which is gated through the IsHotwordAllowed check.
+      if (IsHotwordAllowed())
+        DisableHotwordExtension(GetExtensionService(profile_));
+    }
   }
   UMA_HISTOGRAM_ENUMERATION("Hotword.Enabled", enabled_state,
                             NUM_HOTWORD_ENABLED_METRICS);
 
   pref_registrar_.Init(profile_->GetPrefs());
   pref_registrar_.Add(
       prefs::kHotwordSearchEnabled,
       base::Bind(&HotwordService::OnHotwordSearchEnabledChanged,
                  base::Unretained(this)));
 
@@ skipping 223 matching lines @@
 }
 
 bool HotwordService::IsAlwaysOnEnabled() {
   return
       profile_->GetPrefs()->HasPrefPath(prefs::kHotwordAlwaysOnSearchEnabled) &&
       profile_->GetPrefs()->GetBoolean(prefs::kHotwordAlwaysOnSearchEnabled);
 }
 
 void HotwordService::EnableHotwordExtension(
     ExtensionService* extension_service) {
-  if (extension_service)
+  if (extension_service && !IsExperimentalHotwordingEnabled())
     extension_service->EnableExtension(extension_misc::kHotwordExtensionId);
 }
 
 void HotwordService::DisableHotwordExtension(
     ExtensionService* extension_service) {
   if (extension_service) {
     extension_service->DisableExtension(
         extension_misc::kHotwordExtensionId,
         extensions::Extension::DISABLE_USER_ACTION);
   }
@@ skipping 71 matching lines @@
     return false;
 
   std::string previous_locale =
       profile_->GetPrefs()->GetString(prefs::kHotwordPreviousLanguage);
   std::string locale = GetCurrentLocale(profile_);
 
   // If it's a new locale, then the old extension should be uninstalled.
   return locale != previous_locale &&
       HotwordService::DoesHotwordSupportLanguage(profile_);
 }