Plumb preamble log data from the hotword extension into the speech recognizer.

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 12 matching lines @@
 #include "chrome/browser/ui/app_list/start_page_observer.h"
 #include "chrome/browser/ui/app_list/start_page_service_factory.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
+#include "content/public/browser/speech_recognition_session_preamble.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "extensions/browser/extension_system_provider.h"
 #include "extensions/browser/extensions_browser_client.h"
 #include "extensions/common/extension.h"
 #include "ui/app_list/app_list_switches.h"
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/audio/cras_audio_handler.h"
 #endif
@@ skipping 171 matching lines @@
   if (HotwordService::IsExperimentalHotwordingEnabled() &&
       speech_recognizer_) {
     speech_recognizer_->Stop();
   }
 
 #if defined(OS_CHROMEOS)
   audio_status_.reset();
 #endif
 }
 
-void StartPageService::ToggleSpeechRecognition() {
+void StartPageService::ToggleSpeechRecognition(
+    const scoped_refptr<content::SpeechRecognitionSessionPreamble>& preamble) {
   DCHECK(contents_);
   speech_button_toggled_manually_ = true;
 
   // 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();
+    speech_recognizer_->Start(preamble);
     return;
   }
 
   if (!contents_->GetWebUI())
     return;
 
   if (!webui_finished_loading_) {
     pending_webui_callbacks_.push_back(
         base::Bind(&StartPageService::ToggleSpeechRecognition,
-                   base::Unretained(this)));
+                   base::Unretained(this),
+                   preamble));
     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.
@@ skipping 125 matching lines @@
       ui::PAGE_TRANSITION_AUTO_TOPLEVEL,
       std::string());
 }
 
 void StartPageService::UnloadContents() {
   contents_.reset();
   webui_finished_loading_ = false;
 }
 
 }  // namespace app_list