WebView context menu cleanup.

chrome/browser/renderer_context_menu/render_view_context_menu.cc

Index: chrome/browser/renderer_context_menu/render_view_context_menu.cc
diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
index b3e53ee835a0e986d72134710709c11f767dda2b..e0a5cb9d737a41d27ebd97adf0a662931f3c8546 100644
--- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc
+++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
@@ -517,17 +517,24 @@ void RenderViewContextMenu::AppendCurrentExtensionItems() {
   // For Panel, this happens when the panel is navigated to a url outside of the
   // extension's package.
   const Extension* extension = GetExtension();
-  if (extension) {
-    // Only add extension items from this extension.
-    int index = 0;
-    MenuItem::ExtensionKey key(
-        extension->id(),
-        extensions::WebViewGuest::GetViewInstanceId(source_web_contents_));

[Fady Samuel, 2015/06/19 18:36:10]

Do we still need GetViewInstanceId?

[paulmeyer, 2015/06/19 18:50:59]

Nope. Removed.

-    extension_items_.AppendExtensionItems(key,
-                                          PrintableSelectionText(),
-                                          &index,
-                                          false);  // is_action_menu
+  if (!extension)
+    return;
+
+  auto web_view_guest =

[Devlin, 2015/06/19 18:05:48]

same thought about auto.

[paulmeyer, 2015/06/19 18:18:10]

Done.

+      extensions::WebViewGuest::FromWebContents(source_web_contents_);
+  MenuItem::ExtensionKey key;
+  if (web_view_guest) {
+    key = MenuItem::ExtensionKey(
+        web_view_guest->owner_web_contents()->GetRenderProcessHost()->GetID(),
+        web_view_guest->view_instance_id());
+  } else {
+    key = MenuItem::ExtensionKey(extension->id());
   }
+
+  // Only add extension items from this extension.
+  int index = 0;
+  extension_items_.AppendExtensionItems(key, PrintableSelectionText(), &index,
+                                        false /* is_action_menu */);
 }
 #endif  // defined(ENABLE_EXTENSIONS)