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

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 <string>
 
 #include "base/command_line.h"
 #include "base/i18n/case_conversion.h"
@@ skipping 767 matching lines @@
 HotwordAudioHistoryHandler* HotwordService::GetAudioHistoryHandler() {
   return audio_history_handler_.get();
 }
 
 void HotwordService::SetAudioHistoryHandler(
     HotwordAudioHistoryHandler* handler) {
   audio_history_handler_.reset(handler);
   audio_history_handler_->UpdateAudioHistoryState();
 }
 
 void HotwordService::DisableHotwordPreferences() {

[Lei Zhang, 2015/03/17 04:55:11]

Isn't this the same as:

if (IsAlwaysOnEnabled()) {
  ...
  return;
}
if (IsSometimesOnEnabled()) {
  ...
}

[kcarattini, 2015/03/17 05:07:40]

Well, the whole point of decoupling was to make them more independent. So both
if statements should be executed regardless of the outcome of the other.

[Lei Zhang, 2015/03/17 05:37:13]

Oh, nevermind. I read the CL wrong.

   if (IsSometimesOnEnabled()) {
-    if (profile_->GetPrefs()->HasPrefPath(prefs::kHotwordSearchEnabled))
-      profile_->GetPrefs()->SetBoolean(prefs::kHotwordSearchEnabled, false);
-  } else if (IsAlwaysOnEnabled()) {
-    if (profile_->GetPrefs()->HasPrefPath(
-            prefs::kHotwordAlwaysOnSearchEnabled)) {
-      profile_->GetPrefs()->SetBoolean(prefs::kHotwordAlwaysOnSearchEnabled,
-                                       false);
-    }
+    profile_->GetPrefs()->SetBoolean(prefs::kHotwordSearchEnabled, false);
+  }
+  if (IsAlwaysOnEnabled()) {
+    profile_->GetPrefs()->SetBoolean(prefs::kHotwordAlwaysOnSearchEnabled,
+                                     false);
   }
 }
 
 void HotwordService::OnHotwordSearchEnabledChanged(
     const std::string& pref_name) {
   DCHECK_EQ(pref_name, std::string(prefs::kHotwordSearchEnabled));
 
   ExtensionService* extension_service = GetExtensionService(profile_);
   if (profile_->GetPrefs()->GetBoolean(prefs::kHotwordSearchEnabled))
     EnableHotwordExtension(extension_service);
@@ skipping 80 matching lines @@
   // Only support multiple profiles and profile switching in ChromeOS.
   if (user_manager::UserManager::IsInitialized()) {
     user_manager::User* user =
         user_manager::UserManager::Get()->GetActiveUser();
     if (user && user->is_profile_created())
       return profile_ == ProfileManager::GetActiveUserProfile();
   }
 #endif
   return true;
 }