Remove GetExtensionEventRouter from Profile.

chrome/browser/extensions/menu_manager_unittest.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 <vector>
 
 #include "base/json/json_reader.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/event_names.h"
 #include "chrome/browser/extensions/event_router.h"
+#include "chrome/browser/extensions/extension_system_factory.h"
 #include "chrome/browser/extensions/menu_manager.h"
 #include "chrome/browser/extensions/test_extension_prefs.h"
+#include "chrome/browser/extensions/test_extension_system.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/common/context_menu_params.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 426 matching lines @@
                                         const GURL& event_url,
                                         EventRouter::UserGestureState state) {
     DispatchEventToExtensionMock(extension_id, event_name, event_args.release(),
                                  source_profile, event_url, state);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockEventRouter);
 };
 
+// A mock ExtensionSystem to serve our MockEventRouter.
+class MockExtensionSystem : public TestExtensionSystem {
+ public:
+  explicit MockExtensionSystem(Profile* profile)
+      : TestExtensionSystem(profile) {}
+
+  virtual EventRouter* event_router() {
+    if (!mock_event_router_.get())
+      mock_event_router_.reset(new MockEventRouter(profile_));
+    return mock_event_router_.get();
+  }
+
+ private:
+  scoped_ptr<MockEventRouter> mock_event_router_;
+
+  DISALLOW_COPY_AND_ASSIGN(MockExtensionSystem);
+};
+
+ProfileKeyedService* BuildMockExtensionSystem(Profile* profile) {
+  return new MockExtensionSystem(profile);
+}
+
 // A mock profile for tests of MenuManager::ExecuteCommand.
 class MockTestingProfile : public TestingProfile {

[Yoyo Zhou, 2012/10/25 22:24:47]

Since this is no longer interesting, you can replace it with just
TestingProfile.

[Miranda Callahan, 2012/10/26 19:23:01]

Done.

  public:
   MockTestingProfile() {}
-  MOCK_METHOD0(GetExtensionEventRouter, EventRouter*());
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockTestingProfile);
 };
 
 // Tests the RemoveAll functionality.
 TEST_F(MenuManagerTest, RemoveAll) {
   // Try removing all items for an extension id that doesn't have any items.
   manager_.RemoveAllContextItems("CCCC");
 
@@ skipping 40 matching lines @@
   manager_.RemoveContextMenuItem(item3->id());
   manager_.RemoveContextMenuItem(item1->id());
   manager_.RemoveContextMenuItem(item2->id());
 
   ASSERT_TRUE(manager_.context_items_.empty());
 }
 
 TEST_F(MenuManagerTest, ExecuteCommand) {
   MockTestingProfile profile;
 
-  scoped_ptr<MockEventRouter> mock_event_router(new MockEventRouter(&profile));
+  MockExtensionSystem* mock_extension_system =
+      static_cast<MockExtensionSystem*>(ExtensionSystemFactory::GetInstance()->
+          SetTestingFactoryAndUse(&profile, &BuildMockExtensionSystem));
+  MockEventRouter* mock_event_router =
+      static_cast<MockEventRouter*>(mock_extension_system->event_router());
 
   content::ContextMenuParams params;
   params.media_type = WebKit::WebContextMenuData::MediaTypeImage;
   params.src_url = GURL("http://foo.bar/image.png");
   params.page_url = GURL("http://foo.bar");
   params.selection_text = ASCIIToUTF16("Hello World");
   params.is_editable = false;
 
   Extension* extension = AddExtension("test");
   MenuItem* item = CreateTestItem(extension);
   MenuItem::Id id = item->id();
   ASSERT_TRUE(manager_.AddContextItem(extension, item));
 
-  EXPECT_CALL(profile, GetExtensionEventRouter())
-      .Times(1)
-      .WillOnce(Return(mock_event_router.get()));
-
   // Use the magic of googlemock to save a parameter to our mock's
-  // DispatchEventToExtension method into event_args.
+  // DispatchEventToExtension method into event_)args.

[Yoyo Zhou, 2012/10/25 22:24:47]

spurious

[Miranda Callahan, 2012/10/26 19:23:01]

Done.

   base::ListValue* list = NULL;
   {
     InSequence s;
-    EXPECT_CALL(*mock_event_router.get(),
+    EXPECT_CALL(*mock_event_router,
                 DispatchEventToExtensionMock(
                     item->extension_id(),
                     extensions::event_names::kOnContextMenus,
                     _,
                     &profile,
                     GURL(),
                     EventRouter::USER_GESTURE_ENABLED))
       .Times(1)
       .WillOnce(SaveArg<2>(&list));
-  EXPECT_CALL(*mock_event_router.get(),
+    EXPECT_CALL(*mock_event_router,
               DispatchEventToExtensionMock(
                   item->extension_id(),
                   extensions::event_names::kOnContextMenuClicked,
                   _,
                   &profile,
                   GURL(),
                   EventRouter::USER_GESTURE_ENABLED))
       .Times(1)
       .WillOnce(DeleteArg<2>());
   }
@@ skipping 112 matching lines @@
   ASSERT_TRUE(child1->checked());
 
   // Removing |parent| should cause only |child1| to be selected.
   manager_.RemoveContextMenuItem(parent->id());
   parent = NULL;
   ASSERT_FALSE(new_item->checked());
   ASSERT_TRUE(child1->checked());
 }
 
 }  // namespace extensions