Make NotificationService an interface in the content namespace, and switch callers to use it. Mov...

chrome/browser/extensions/speech_input/extension_speech_input_manager.cc

 // Copyright (c) 2011 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/extensions/speech_input/extension_speech_input_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/speech_input/extension_speech_input_api_constants.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/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/browser/browser_thread.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 
 using namespace speech_input;
 
 namespace constants = extension_speech_input_api_constants;
 
 namespace {
 
 // Caller id provided to the speech recognizer. Since only one extension can
 // be recording on the same time a constant value is enough as id.
 static const int kSpeechCallerId = 1;
@@ skipping 234 matching lines @@
 
   base::AutoLock auto_lock(state_lock_);
   if (state_ == kShutdown)
     return;
 
   DCHECK_EQ(state_, kStarting);
   VLOG(1) << "State changed to recording";
   state_ = kRecording;
 
   VLOG(1) << "Sending start notification";
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_EXTENSION_SPEECH_INPUT_RECORDING_STARTED,
       content::Source<Profile>(profile_),
       content::Details<std::string>(&extension_id_in_use_));
 }
 
 void ExtensionSpeechInputManager::OnRecognizerError(
     int caller_id, SpeechInputError error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK_EQ(caller_id, kSpeechCallerId);
   VLOG(1) << "OnRecognizerError: " << error;
@@ skipping 112 matching lines @@
   {
     base::AutoLock auto_lock(state_lock_);
     if (state_ == kShutdown)
       return;
 
     extension_id = extension_id_in_use_;
     ResetToIdleState();
 
     // Will set the error property in the ongoing extension function calls.
     ExtensionError details(extension_id, error);
-    NotificationService::current()->Notify(
+    content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_EXTENSION_SPEECH_INPUT_FAILED,
         content::Source<Profile>(profile_),
         content::Details<ExtensionError>(&details));
   }
 
   // Used for errors that are also reported via the onError event.
   if (dispatch_event) {
     ListValue args;
     DictionaryValue *js_error = new DictionaryValue();
     args.Append(js_error);
@@ skipping 178 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   VLOG(1) << "Stop succeeded (UI thread)";
 
   base::AutoLock auto_lock(state_lock_);
   if (state_ == kShutdown)
     return;
 
   std::string extension_id = extension_id_in_use_;
   ResetToIdleState();
 
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_EXTENSION_SPEECH_INPUT_RECORDING_STOPPED,
       // Guarded by the state_ == kShutdown check.
       content::Source<Profile>(profile_),      
       content::Details<std::string>(&extension_id));
 }