Remove deprecated extension EventRouter APIs.

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/files/scoped_temp_dir.h"
 #include "base/json/json_reader.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop.h"
@@ skipping 439 matching lines @@
 
   MOCK_METHOD6(DispatchEventToExtensionMock,
                void(const std::string& extension_id,
                     const std::string& event_name,
                     base::ListValue* event_args,
                     Profile* source_profile,
                     const GURL& event_url,
                     EventRouter::UserGestureState state));
 
   virtual void DispatchEventToExtension(const std::string& extension_id,
-                                        const std::string& event_name,
-                                        scoped_ptr<base::ListValue> event_args,
-                                        Profile* source_profile,
-                                        const GURL& event_url,
-                                        EventRouter::UserGestureState state) {
-    DispatchEventToExtensionMock(extension_id, event_name, event_args.release(),
-                                 source_profile, event_url, state);
+                                        scoped_ptr<Event> event) {
+    DispatchEventToExtensionMock(extension_id,

[Yoyo Zhou, 2012/12/05 22:28:32]

This mock method doesn't make sense anymore; it should reflect the new
interface. Don't know if you want to postpone fixing that to a later CL.

[Matt Perry, 2012/12/05 22:53:53]

If you look later in the file, it uses gmock to check that the method is called
with certain parameters. I don't know if it's possible to do that if you change
the mock to accept a single Event struct.

+                                 event->event_name,
+                                 event->event_args.release(),
+                                 event->restrict_to_profile,
+                                 event->event_url,
+                                 event->user_gesture);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockEventRouter);
 };
 
 // A mock ExtensionSystem to serve our MockEventRouter.
 class MockExtensionSystem : public TestExtensionSystem {
  public:
   explicit MockExtensionSystem(Profile* profile)
@@ skipping 264 matching lines @@
   EXPECT_EQ(4u, manager_.MenuItems(extension1->id())->size());
   EXPECT_EQ(1u, manager_.MenuItems(extension2->id())->size());
 
   // Remove all context menu items with incognito true.
   manager_.RemoveAllIncognitoContextItems();
   EXPECT_EQ(2u, manager_.MenuItems(extension1->id())->size());
   EXPECT_EQ(1u, manager_.MenuItems(extension2->id())->size());
 }
 
 }  // namespace extensions