Hotword Audio Verification app: control the hotword settings

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 bdbbf5451ab826bd2f76783fd64d8bfb3c021423..c6cb2bae2969ed2ebe06939bf11202d0b138beef 100644
--- a/chrome/browser/search/hotword_service.cc
+++ b/chrome/browser/search/hotword_service.cc
@@ -215,14 +215,6 @@ HotwordService::HotwordService(Profile* profile)
       base::Bind(&HotwordService::OnHotwordSearchEnabledChanged,
                  base::Unretained(this)));
 
-  // TODO(kcarattini): Control the enabling of the pref with the Hotword
-  // Audio Verification app, rather than listening for a change in the
-  // enabled state.
-  pref_registrar_.Add(
-      prefs::kHotwordAlwaysOnSearchEnabled,
-      base::Bind(&HotwordService::OnHotwordAlwaysOnSearchEnabledChanged,
-                 base::Unretained(this)));
-
   registrar_.Add(this,
                  chrome::NOTIFICATION_BROWSER_WINDOW_READY,
                  content::NotificationService::AllSources());
@@ -453,14 +445,6 @@ void HotwordService::DisableHotwordExtension(
   }
 }
 
-void HotwordService::OnHotwordAlwaysOnSearchEnabledChanged(
-    const std::string& pref_name) {
-  DCHECK_EQ(pref_name, std::string(prefs::kHotwordAlwaysOnSearchEnabled));
-  // TODO(kcarattini): Launch in the appropriate mode given the state of
-  // the account-level Audio History setting.
-  LaunchHotwordAudioVerificationApp(HOTWORD_AND_AUDIO_HISTORY);
-}
-
 void HotwordService::LaunchHotwordAudioVerificationApp(
     const LaunchMode& launch_mode) {
   hotword_audio_verification_launch_mode_ = launch_mode;