Moved ExtensionMessage* into extensions namespace

chrome/browser/extensions/message_handler.cc

Index: chrome/browser/extensions/message_handler.cc
diff --git a/chrome/browser/extensions/extension_message_handler.cc b/chrome/browser/extensions/message_handler.cc
similarity index 70%
rename from chrome/browser/extensions/extension_message_handler.cc
rename to chrome/browser/extensions/message_handler.cc
index 75272f875fc8073b65eae2c52626185942a41621..86f48a55a0c5b92e0277224ee34d0005b0f7267e 100644
--- a/chrome/browser/extensions/extension_message_handler.cc
+++ b/chrome/browser/extensions/message_handler.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/extensions/extension_message_handler.h"
+#include "chrome/browser/extensions/message_handler.h"
 
-#include "chrome/browser/extensions/extension_message_service.h"
 #include "chrome/browser/extensions/extension_system.h"
+#include "chrome/browser/extensions/message_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/view_type_utils.h"
 #include "chrome/common/extensions/extension_messages.h"
@@ -15,38 +15,42 @@
 
 using content::WebContents;
 
-ExtensionMessageHandler::ExtensionMessageHandler(
+namespace extensions {
+
+MessageHandler::MessageHandler(
     content::RenderViewHost* render_view_host)
     : content::RenderViewHostObserver(render_view_host) {
 }
 
-ExtensionMessageHandler::~ExtensionMessageHandler() {
+MessageHandler::~MessageHandler() {
 }
 
-bool ExtensionMessageHandler::OnMessageReceived(
+bool MessageHandler::OnMessageReceived(
     const IPC::Message& message) {
   bool handled = true;
-  IPC_BEGIN_MESSAGE_MAP(ExtensionMessageHandler, message)
+  IPC_BEGIN_MESSAGE_MAP(MessageHandler, message)
     IPC_MESSAGE_HANDLER(ExtensionHostMsg_PostMessage, OnPostMessage)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
-void ExtensionMessageHandler::RenderViewHostInitialized() {
+void MessageHandler::RenderViewHostInitialized() {
   WebContents* web_contents =
       WebContents::FromRenderViewHost(render_view_host());
   Send(new ExtensionMsg_NotifyRenderViewType(
       routing_id(), chrome::GetViewType(web_contents)));
 }
 
-void ExtensionMessageHandler::OnPostMessage(int port_id,
+void MessageHandler::OnPostMessage(int port_id,
                                             const std::string& message) {
   Profile* profile = Profile::FromBrowserContext(
       render_view_host()->GetProcess()->GetBrowserContext());
-  ExtensionMessageService* message_service =
-      extensions::ExtensionSystem::Get(profile)->message_service();
+  MessageService* message_service =
+      ExtensionSystem::Get(profile)->message_service();
   if (message_service) {
     message_service->PostMessageFromRenderer(port_id, message);
   }
 }
+
+}  // namespace extensions