Introducing new data types and IPC messages for scripted JS speech recognition APIs (Speech CL2.0)

content/browser/speech/speech_recognition_manager_impl.cc

 // Copyright (c) 2012 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 "content/browser/speech/speech_recognition_manager_impl.h"
 
 #include "base/bind.h"
 #include "base/memory/singleton.h"
 #include "content/browser/browser_main_loop.h"
 #include "content/browser/speech/google_one_shot_remote_engine.h"
@@ skipping 58 matching lines @@
   Session& session = sessions_[session_id];
   session.id = session_id;
   session.event_listener = event_listener;
   session.context = config.initial_context;
 
   std::string hardware_info;
   bool can_report_metrics = false;
   if (delegate_)
     delegate_->GetDiagnosticInformation(&can_report_metrics, &hardware_info);
 
-  GoogleOneShotRemoteEngineConfig remote_engine_config;
+  SpeechRecognitionEngineConfig remote_engine_config;
   remote_engine_config.language = config.language;
-  remote_engine_config.grammar = config.grammar;
+  remote_engine_config.grammars = config.grammars;
   remote_engine_config.audio_sample_rate =
       SpeechRecognizerImpl::kAudioSampleRate;
   remote_engine_config.audio_num_bits_per_sample =
      SpeechRecognizerImpl::kNumBitsPerAudioSample;
   remote_engine_config.filter_profanities = config.filter_profanities;
   remote_engine_config.hardware_info = hardware_info;
   remote_engine_config.origin_url = can_report_metrics ? config.origin_url : "";
 
-  GoogleOneShotRemoteEngine* google_remote_engine =
-      new GoogleOneShotRemoteEngine(config.url_request_context_getter);
+  SpeechRecognitionEngine* google_remote_engine =
+        new GoogleOneShotRemoteEngine(config.url_request_context_getter);
   google_remote_engine->SetConfig(remote_engine_config);
 
   session.recognizer = new SpeechRecognizerImpl(this,
                                                 session_id,
                                                 google_remote_engine);
   return session_id;
 }
 
 void SpeechRecognitionManagerImpl::StartSession(int session_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
@@ skipping 515 matching lines @@
 SpeechRecognitionManagerImpl::Session::Session()
   : id(kSessionIDInvalid),
     event_listener(NULL),
     state(STATE_IDLE) {
 }
 
 SpeechRecognitionManagerImpl::Session::~Session() {
 }
 
 }  // namespace speech