1 files changed, 11 insertions, 11 deletions
diff --git a/chrome/browser/extensions/extension_menu_manager_unittest.cc b/chrome/browser/extensions/extension_menu_manager_unittest.cc
index 490db51..3dc6f69 100644
--- a/chrome/browser/extensions/extension_menu_manager_unittest.cc
+++ b/chrome/browser/extensions/extension_menu_manager_unittest.cc
@@ -10,8 +10,8 @@
 #include "base/scoped_vector.h"
 #include "base/values.h"
 #include "chrome/browser/browser_thread.h"
+#include "chrome/browser/extensions/extension_event_router.h"
 #include "chrome/browser/extensions/extension_menu_manager.h"
-#include "chrome/browser/extensions/extension_message_service.h"
 #include "chrome/browser/extensions/test_extension_prefs.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension.h"
@@ -331,10 +331,10 @@ TEST_F(ExtensionMenuManagerTest, ExtensionUnloadRemovesMenuItems) {
 }
 
 // A mock message service for tests of ExtensionMenuManager::ExecuteCommand.
-class MockExtensionMessageService : public ExtensionMessageService {
+class MockExtensionEventRouter : public ExtensionEventRouter {
  public:
-  explicit MockExtensionMessageService(Profile* profile) :
-      ExtensionMessageService(profile) {}
+  explicit MockExtensionEventRouter(Profile* profile) :
+      ExtensionEventRouter(profile) {}
 
   MOCK_METHOD4(DispatchEventToRenderers, void(const std::string& event_name,
                                               const std::string& event_args,
@@ -342,14 +342,14 @@ class MockExtensionMessageService : public ExtensionMessageService {
                                               const GURL& event_url));
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(MockExtensionMessageService);
+  DISALLOW_COPY_AND_ASSIGN(MockExtensionEventRouter);
 };
 
 // A mock profile for tests of ExtensionMenuManager::ExecuteCommand.
 class MockTestingProfile : public TestingProfile {
  public:
   MockTestingProfile() {}
-  MOCK_METHOD0(GetExtensionMessageService, ExtensionMessageService*());
+  MOCK_METHOD0(GetExtensionEventRouter, ExtensionEventRouter*());
   MOCK_METHOD0(IsOffTheRecord, bool());
 
  private:
@@ -394,8 +394,8 @@ TEST_F(ExtensionMenuManagerTest, ExecuteCommand) {
 
   MockTestingProfile profile;
 
-  scoped_refptr<MockExtensionMessageService> mock_message_service =
-      new MockExtensionMessageService(&profile);
+  scoped_ptr<MockExtensionEventRouter> mock_event_router(
+      new MockExtensionEventRouter(&profile));
 
   ContextMenuParams params;
   params.media_type = WebKit::WebContextMenuData::MediaTypeImage;
@@ -409,15 +409,15 @@ TEST_F(ExtensionMenuManagerTest, ExecuteCommand) {
   ExtensionMenuItem::Id id = item->id();
   ASSERT_TRUE(manager_.AddContextItem(extension, item));
 
-  EXPECT_CALL(profile, GetExtensionMessageService())
+  EXPECT_CALL(profile, GetExtensionEventRouter())
       .Times(1)
-      .WillOnce(Return(mock_message_service.get()));
+      .WillOnce(Return(mock_event_router.get()));
 
   // Use the magic of googlemock to save a parameter to our mock's
   // DispatchEventToRenderers method into event_args.
   std::string event_args;
   std::string expected_event_name = "contextMenus/" + item->extension_id();
-  EXPECT_CALL(*mock_message_service.get(),
+  EXPECT_CALL(*mock_event_router.get(),
               DispatchEventToRenderers(expected_event_name, _,
                                        &profile,
                                        GURL()))