diff options
author | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-13 01:51:20 +0000 |
---|---|---|
committer | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-13 01:51:20 +0000 |
commit | 504bf9c23553b47cb482826aaee272f30d95bab0 (patch) | |
tree | b9875c54ca2ab8a943fc173328c149f96a743b9c /chrome/browser/extensions/menu_manager_unittest.cc | |
parent | e466aaf8879c1b585999cc8625d06a772ab4ced1 (diff) | |
download | chromium_src-504bf9c23553b47cb482826aaee272f30d95bab0.zip chromium_src-504bf9c23553b47cb482826aaee272f30d95bab0.tar.gz chromium_src-504bf9c23553b47cb482826aaee272f30d95bab0.tar.bz2 |
Fix parentMenuItemId in context menu click callback.
BUG=165771
Review URL: https://codereview.chromium.org/11552025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172769 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/menu_manager_unittest.cc')
-rw-r--r-- | chrome/browser/extensions/menu_manager_unittest.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/browser/extensions/menu_manager_unittest.cc b/chrome/browser/extensions/menu_manager_unittest.cc index 207e179..1478925 100644 --- a/chrome/browser/extensions/menu_manager_unittest.cc +++ b/chrome/browser/extensions/menu_manager_unittest.cc @@ -561,9 +561,12 @@ TEST_F(MenuManagerTest, ExecuteCommand) { params.is_editable = false; Extension* extension = AddExtension("test"); + MenuItem* parent = CreateTestItem(extension); MenuItem* item = CreateTestItem(extension); + MenuItem::Id parent_id = parent->id(); MenuItem::Id id = item->id(); - ASSERT_TRUE(manager_.AddContextItem(extension, item)); + ASSERT_TRUE(manager_.AddContextItem(extension, parent)); + ASSERT_TRUE(manager_.AddChildItem(parent->id(), item)); // Use the magic of googlemock to save a parameter to our mock's // DispatchEventToExtension method into event_args. @@ -601,6 +604,8 @@ TEST_F(MenuManagerTest, ExecuteCommand) { int tmp_id = 0; ASSERT_TRUE(info->GetInteger("menuItemId", &tmp_id)); ASSERT_EQ(id.uid, tmp_id); + ASSERT_TRUE(info->GetInteger("parentMenuItemId", &tmp_id)); + ASSERT_EQ(parent_id.uid, tmp_id); std::string tmp; ASSERT_TRUE(info->GetString("mediaType", &tmp)); |