Refactoring of chrome speech recognition architecture (CL1.3)

chrome/browser/speech/speech_input_extension_manager.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 "chrome/browser/speech/speech_input_extension_manager.h"
 
 #include "base/bind.h"
 #include "base/json/json_writer.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_event_router.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_dependency_manager.h"
 #include "chrome/browser/profiles/profile_keyed_service.h"
 #include "chrome/browser/profiles/profile_keyed_service_factory.h"
 #include "chrome/browser/speech/speech_input_extension_notification.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/speech_recognition_manager.h"
 #include "content/public/browser/speech_recognizer.h"
+#include "content/public/common/speech_recognition_error.h"
 #include "content/public/common/speech_recognition_result.h"
 
 using content::BrowserThread;
 using content::SpeechRecognitionHypothesis;
 using content::SpeechRecognitionManager;
 
 namespace {
 
 const char kErrorNoRecordingDeviceFound[] = "noRecordingDeviceFound";
 const char kErrorRecordingDeviceInUse[] = "recordingDeviceInUse";
@@ skipping 296 matching lines @@
   }
 
   VLOG(1) << "Sending start notification";
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_EXTENSION_SPEECH_INPUT_RECORDING_STARTED,
       content::Source<Profile>(profile_),
       content::Details<std::string>(&extension_id_in_use_));
 }
 
 void SpeechInputExtensionManager::OnRecognitionError(
-    int caller_id, const content::SpeechRecognitionErrorCode& error) {
+    int caller_id, const content::SpeechRecognitionError& error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK_EQ(caller_id, kSpeechCallerId);
-  VLOG(1) << "OnRecognitionError: " << error;
+  VLOG(1) << "OnRecognitionError: " << error.code;
 
   base::AutoLock auto_lock(state_lock_);
   if (state_ == kShutdown)
     return;
 
   // Release the recognizer object.
   GetSpeechInputExtensionInterface()->StopRecording(true);
 
   std::string event_error_code;
   bool report_to_event = true;
 
-  switch (error) {
+  switch (error.code) {
     case content::SPEECH_RECOGNITION_ERROR_NONE:
       break;
 
     case content::SPEECH_RECOGNITION_ERROR_AUDIO:
       if (state_ == kStarting) {
         event_error_code = kErrorUnableToStart;
         report_to_event = false;
       } else {
         event_error_code = kErrorCaptureError;
       }
@@ skipping 352 matching lines @@
       base::Bind(&SpeechInputExtensionManager::SetInputVolumeOnUIThread,
       this, volume));
 }
 
 void SpeechInputExtensionManager::SetInputVolumeOnUIThread(
     float volume) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(notification_.get());
   notification_->SetVUMeterVolume(volume);
 }