Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1601)

Unified Diff: chrome/browser/extensions/extension_menu_manager_unittest.cc

Issue 10454106: Dispatch a new event chrome.contextMenus.onClicked. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: names Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/extension_menu_manager_unittest.cc
diff --git a/chrome/browser/extensions/extension_menu_manager_unittest.cc b/chrome/browser/extensions/extension_menu_manager_unittest.cc
index 5e3173c5520588f6cfa1b21d08de0ffc62fe0b6b..1ce324941cb9f959b8ea36ea828873b7054ccb29 100644
--- a/chrome/browser/extensions/extension_menu_manager_unittest.cc
+++ b/chrome/browser/extensions/extension_menu_manager_unittest.cc
@@ -11,6 +11,7 @@
#include "base/scoped_temp_dir.h"
#include "base/utf_string_conversions.h"
#include "base/values.h"
+#include "chrome/browser/extensions/extension_event_names.h"
#include "chrome/browser/extensions/extension_event_router.h"
#include "chrome/browser/extensions/extension_menu_manager.h"
#include "chrome/browser/extensions/test_extension_prefs.h"
@@ -29,6 +30,7 @@ using content::BrowserThread;
using extensions::Extension;
using testing::_;
using testing::AtLeast;
+using testing::InSequence;
using testing::Return;
using testing::SaveArg;
@@ -476,18 +478,28 @@ TEST_F(ExtensionMenuManagerTest, ExecuteCommand) {
// Use the magic of googlemock to save a parameter to our mock's
// DispatchEventToExtension method into event_args.
std::string event_args;
- std::string expected_event_name = "contextMenus";
+ {
+ InSequence s;
+ EXPECT_CALL(*mock_event_router.get(),
+ DispatchEventToExtension(
+ item->extension_id(),
+ extension_event_names::kOnContextMenus,
+ _,
+ &profile,
+ GURL(),
+ ExtensionEventRouter::USER_GESTURE_ENABLED))
+ .Times(1)
+ .WillOnce(SaveArg<2>(&event_args));
EXPECT_CALL(*mock_event_router.get(),
DispatchEventToExtension(
item->extension_id(),
- expected_event_name,
+ extension_event_names::kOnContextMenuClicked,
_,
&profile,
GURL(),
ExtensionEventRouter::USER_GESTURE_ENABLED))
- .Times(1)
- .WillOnce(SaveArg<2>(&event_args));
-
+ .Times(1);
+ }
manager_.ExecuteCommand(&profile, NULL /* tab_contents */, params, id);
// Parse the json event_args, which should turn into a 2-element list where

Powered by Google App Engine
This is Rietveld 408576698