Hotword: Decouple sometimes and always on prefs when disabling. They can both exist independently.

chrome/browser/search/hotword_service.cc

Index: chrome/browser/search/hotword_service.cc
diff --git a/chrome/browser/search/hotword_service.cc b/chrome/browser/search/hotword_service.cc
index 7560a50c93ba348e54618446b38439b29fc2cb16..1b9231efa98786f6c08a4a552126b34bd968aa3f 100644
--- a/chrome/browser/search/hotword_service.cc
+++ b/chrome/browser/search/hotword_service.cc
@@ -789,7 +789,8 @@ void HotwordService::DisableHotwordPreferences() {
   if (IsSometimesOnEnabled()) {
     if (profile_->GetPrefs()->HasPrefPath(prefs::kHotwordSearchEnabled))

[Anand Mistry (off Chromium), 2015/03/17 03:05:40]

Get rid of these two HasPrefPath checks. IsFooEnabled() implies the Foo
preference exists and is set to true. No point in checking for existence again.

[kcarattini, 2015/03/17 04:07:39]

Done.

       profile_->GetPrefs()->SetBoolean(prefs::kHotwordSearchEnabled, false);
-  } else if (IsAlwaysOnEnabled()) {
+  }
+  if (IsAlwaysOnEnabled()) {
     if (profile_->GetPrefs()->HasPrefPath(
             prefs::kHotwordAlwaysOnSearchEnabled)) {
       profile_->GetPrefs()->SetBoolean(prefs::kHotwordAlwaysOnSearchEnabled,