Give platform apps control over launcher right-click context menu.

chrome/browser/extensions/extension_context_menu_browsertest.cc

Index: chrome/browser/extensions/extension_context_menu_browsertest.cc
diff --git a/chrome/browser/extensions/extension_context_menu_browsertest.cc b/chrome/browser/extensions/extension_context_menu_browsertest.cc
index 442d2abf426238b644f1d704338a3ad76501f785..3bf89da471f5a3b3367aa1fe642323f992c1fc7b 100644
--- a/chrome/browser/extensions/extension_context_menu_browsertest.cc
+++ b/chrome/browser/extensions/extension_context_menu_browsertest.cc
@@ -42,7 +42,7 @@ class TestRenderViewContextMenu : public RenderViewContextMenu {
   bool HasExtensionItemWithLabel(const std::string& label) {
     string16 label16 = UTF8ToUTF16(label);
     std::map<int, MenuItem::Id>::iterator i;
-    for (i = extension_item_map_.begin(); i != extension_item_map_.end(); ++i) {
+    for (i = menu_manager_.map_begin(); i != menu_manager_.map_end(); ++i) {
       const MenuItem::Id& id = i->second;
       string16 tmp_label;
       EXPECT_TRUE(GetItemLabel(id, &tmp_label));
@@ -99,7 +99,7 @@ class TestRenderViewContextMenu : public RenderViewContextMenu {
   // in the menu.
   bool FindCommandId(const MenuItem::Id& id, int* command_id) {
     std::map<int, MenuItem::Id>::const_iterator i;
-    for (i = extension_item_map_.begin(); i != extension_item_map_.end(); ++i) {
+    for (i = menu_manager_.map_begin(); i != menu_manager_.map_end(); ++i) {
       if (i->second == id) {
         *command_id = i->first;
         return true;
@@ -302,7 +302,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionContextMenuBrowserTest, LongTitle) {
   ASSERT_TRUE(listener.WaitUntilSatisfied());
 
   // Make sure we have an item registered with a long title.
-  size_t limit = RenderViewContextMenu::kMaxExtensionItemTitleLength;
+  size_t limit = extensions::ContextMenuManager::kMaxExtensionItemTitleLength;
   MenuItem::List items = GetItems();
   ASSERT_EQ(1u, items.size());
   MenuItem* item = items.at(0);