Eliminate the launcher speech recognizer's dependency on the start page WebContents.

chrome/browser/ui/app_list/start_page_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/ui/app_list/start_page_service.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 206 matching lines @@
   }
 
 #if defined(OS_CHROMEOS)
   audio_status_.reset();
 #endif
 }
 
 void StartPageService::ToggleSpeechRecognition() {
   DCHECK(contents_);
   speech_button_toggled_manually_ = true;
-  if (!contents_->GetWebUI())
-    return;
 
-  if (!webui_finished_loading_) {
-    pending_webui_callbacks_.push_back(
-        base::Bind(&StartPageService::ToggleSpeechRecognition,
-                   base::Unretained(this)));
-    return;
-  }
-
+  // Speech recognition under V2 hotwording does not depend in any way on the
+  // start page web contents. Do this code path first to make this explicit and
+  // easier to identify what code needs to be deleted when V2 hotwording is
+  // stable.
   if (HotwordService::IsExperimentalHotwordingEnabled()) {
     if (!speech_recognizer_) {
       std::string profile_locale;
 #if defined(OS_CHROMEOS)
       profile_locale = profile_->GetPrefs()->GetString(
           prefs::kApplicationLocale);
 #endif
       if (profile_locale.empty())
         profile_locale = g_browser_process->GetApplicationLocale();
 
       speech_recognizer_.reset(
           new SpeechRecognizer(weak_factory_.GetWeakPtr(),
                                profile_->GetRequestContext(),
                                profile_locale));
     }
 
     speech_recognizer_->Start();
     return;
   }
 
+  if (!contents_->GetWebUI())
+    return;
+
+  if (!webui_finished_loading_) {
+    pending_webui_callbacks_.push_back(
+        base::Bind(&StartPageService::ToggleSpeechRecognition,
+                   base::Unretained(this)));
+    return;
+  }
+
   contents_->GetWebUI()->CallJavascriptFunction(
       "appList.startPage.toggleSpeechRecognition");
 }
 
 bool StartPageService::HotwordEnabled() {
 // Voice input for the launcher is unsupported on non-ChromeOS platforms.
 // TODO(amistry): Make speech input, and hotwording, work on non-ChromeOS.
 #if defined(OS_CHROMEOS)
   if (HotwordService::IsExperimentalHotwordingEnabled()) {
     HotwordService* service = HotwordServiceFactory::GetForProfile(profile_);
@@ skipping 68 matching lines @@
     RecordAction(UserMetricsAction("AppList_VoiceSearchCanceled"));
   }
   speech_button_toggled_manually_ = false;
   speech_result_obtained_ = false;
   state_ = new_state;
   FOR_EACH_OBSERVER(StartPageObserver,
                     observers_,
                     OnSpeechRecognitionStateChanged(new_state));
 }
 
-content::WebContents* StartPageService::GetSpeechContents() {
-  return GetSpeechRecognitionContents();
-}
-
 void StartPageService::GetSpeechAuthParameters(std::string* auth_scope,
                                                std::string* auth_token) {
   if (HotwordService::IsExperimentalHotwordingEnabled()) {
     HotwordService* service = HotwordServiceFactory::GetForProfile(profile_);
     if (service &&
         service->IsOptedIntoAudioLogging() &&
         !speech_auth_helper_->GetToken().empty()) {
       *auth_scope = speech_auth_helper_->GetScope();
       *auth_token = speech_auth_helper_->GetToken();
     }
@@ skipping 33 matching lines @@
       ui::PAGE_TRANSITION_AUTO_TOPLEVEL,
       std::string());
 }
 
 void StartPageService::UnloadContents() {
   contents_.reset();
   webui_finished_loading_ = false;
 }
 
 }  // namespace app_list