summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_menu_manager_unittest.cc
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-13 15:02:53 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-13 15:02:53 +0000
commit9f005fe34de31a4db2e5e71c1780681cf8e81f6d (patch)
treed05519124cbcb006311f551a7c23575c5545c8b0 /chrome/browser/extensions/extension_menu_manager_unittest.cc
parent115db1d73d21e02b498a8fe369f02fdca93bb2db (diff)
downloadchromium_src-9f005fe34de31a4db2e5e71c1780681cf8e81f6d.zip
chromium_src-9f005fe34de31a4db2e5e71c1780681cf8e81f6d.tar.gz
chromium_src-9f005fe34de31a4db2e5e71c1780681cf8e81f6d.tar.bz2
Revert 44351 - Reland 44348 Add support for restricting broadcasting events to extensions based on host permissions
BUG=38398 TEST=none TBR=jochen@chromium.org Review URL: http://codereview.chromium.org/1642005 TBR=jochen@chromium.org Review URL: http://codereview.chromium.org/1521027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44355 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_menu_manager_unittest.cc')
-rw-r--r--chrome/browser/extensions/extension_menu_manager_unittest.cc8
1 files changed, 3 insertions, 5 deletions
diff --git a/chrome/browser/extensions/extension_menu_manager_unittest.cc b/chrome/browser/extensions/extension_menu_manager_unittest.cc
index bdc282e..e81fc04 100644
--- a/chrome/browser/extensions/extension_menu_manager_unittest.cc
+++ b/chrome/browser/extensions/extension_menu_manager_unittest.cc
@@ -201,10 +201,9 @@ class MockExtensionMessageService : public ExtensionMessageService {
explicit MockExtensionMessageService(Profile* profile) :
ExtensionMessageService(profile) {}
- MOCK_METHOD4(DispatchEventToRenderers, void(const std::string& event_name,
+ MOCK_METHOD3(DispatchEventToRenderers, void(const std::string& event_name,
const std::string& event_args,
- bool has_incognito_data,
- const GURL& event_url));
+ bool has_incognito_data));
private:
DISALLOW_COPY_AND_ASSIGN(MockExtensionMessageService);
@@ -255,8 +254,7 @@ TEST_F(ExtensionMenuManagerTest, ExecuteCommand) {
std::string expected_event_name = "contextMenu/" + item->extension_id();
EXPECT_CALL(*mock_message_service.get(),
DispatchEventToRenderers(expected_event_name, _,
- profile.IsOffTheRecord(),
- GURL()))
+ profile.IsOffTheRecord()))
.Times(1)
.WillOnce(SaveArg<1>(&event_args));