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 769 matching lines @@
 }
 
 void HotwordService::SetAudioHistoryHandler(
     HotwordAudioHistoryHandler* handler) {
   audio_history_handler_.reset(handler);
   audio_history_handler_->UpdateAudioHistoryState();
 }
 
 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,
                                        false);
     }
   }
 }
 
 void HotwordService::OnHotwordSearchEnabledChanged(
     const std::string& pref_name) {
@@ skipping 85 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;
 }