Move ExtensionEventRouter and related into extensions namespace

chrome/browser/speech/extension_api/tts_engine_extension_api.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/extension_api/tts_engine_extension_api.h"
 
 #include <string>
 
 #include "base/json/json_writer.h"
 #include "base/values.h"
-#include "chrome/browser/extensions/extension_event_router.h"
+#include "chrome/browser/extensions/event_router.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/speech/extension_api/tts_extension_api_constants.h"
 #include "chrome/browser/speech/extension_api/tts_extension_api_controller.h"
 #include "chrome/common/extensions/extension.h"
 
 using extensions::Extension;
 
 namespace constants = tts_extension_api_constants;
 
 namespace events {
 const char kOnSpeak[] = "ttsEngine.onSpeak";
 const char kOnStop[] = "ttsEngine.onStop";
 };  // namespace events
 
 namespace {
 // Given a language/region code of the form 'fr-FR', returns just the basic
 // language portion, e.g. 'fr'.
 std::string TrimLanguageCode(std::string lang) {
   if (lang.size() >= 5 && lang[2] == '-')
     return lang.substr(0, 2);
   else
     return lang;
 }
 }
 
 void GetExtensionVoices(Profile* profile, ListValue* result_voices) {
   ExtensionService* service = profile->GetExtensionService();
   DCHECK(service);
-  ExtensionEventRouter* event_router = profile->GetExtensionEventRouter();
+  extensions::EventRouter* event_router = profile->GetExtensionEventRouter();
   DCHECK(event_router);
 
   const ExtensionSet* extensions = service->extensions();
   ExtensionSet::const_iterator iter;
   for (iter = extensions->begin(); iter != extensions->end(); ++iter) {
     const Extension* extension = *iter;
 
     if (!event_router->ExtensionHasEventListener(
             extension->id(), events::kOnSpeak) ||
         !event_router->ExtensionHasEventListener(
@@ skipping 41 matching lines @@
     Utterance* utterance,
     const Extension** matching_extension,
     size_t* voice_index) {
   // This will only happen during unit testing. Otherwise, an utterance
   // will always have an associated profile.
   if (!utterance->profile())
     return false;
 
   ExtensionService* service = utterance->profile()->GetExtensionService();
   DCHECK(service);
-  ExtensionEventRouter* event_router =
+  extensions::EventRouter* event_router =
       utterance->profile()->GetExtensionEventRouter();
   DCHECK(event_router);
 
   *matching_extension = NULL;
   *voice_index = -1;
   const ExtensionSet* extensions = service->extensions();
   ExtensionSet::const_iterator iter;
 
   // Make two passes: the first time, do strict language matching
   // ('fr-FR' does not match 'fr-CA'). The second time, do prefix
@@ skipping 169 matching lines @@
     std::string error_message;
     event->GetString(constants::kErrorMessageKey, &error_message);
     controller->OnTtsEvent(
         utterance_id, TTS_EVENT_ERROR, char_index, error_message);
   } else {
     EXTENSION_FUNCTION_VALIDATE(false);
   }
 
   return true;
 }