<webview>: Context menu API implementation CL.

chrome/browser/extensions/api/context_menus/context_menus_api.cc

Index: chrome/browser/extensions/api/context_menus/context_menus_api.cc
diff --git a/chrome/browser/extensions/api/context_menus/context_menus_api.cc b/chrome/browser/extensions/api/context_menus/context_menus_api.cc
index 4c5e6b56836793889b47030d056be76300a18a56..e9e7f76f27c32be82b4c2eddd9d70f0c522fd682 100644
--- a/chrome/browser/extensions/api/context_menus/context_menus_api.cc
+++ b/chrome/browser/extensions/api/context_menus/context_menus_api.cc
@@ -33,7 +33,8 @@ namespace Remove = api::context_menus::Remove;
 namespace Update = api::context_menus::Update;
 
 bool ContextMenusCreateFunction::RunImpl() {
-  MenuItem::Id id(GetProfile()->IsOffTheRecord(), extension_id());
+  MenuItem::Id id(GetProfile()->IsOffTheRecord(),
+                  MenuItem::ExtensionKey(extension_id()));
   scoped_ptr<Create::Params> params(Create::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
@@ -57,7 +58,8 @@ bool ContextMenusCreateFunction::RunImpl() {
 }
 
 bool ContextMenusUpdateFunction::RunImpl() {
-  MenuItem::Id item_id(GetProfile()->IsOffTheRecord(), extension_id());
+  MenuItem::Id item_id(GetProfile()->IsOffTheRecord(),
+                       MenuItem::ExtensionKey(extension_id()));
   scoped_ptr<Update::Params> params(Update::Params::Create(*args_));
 
   EXTENSION_FUNCTION_VALIDATE(params.get());
@@ -78,7 +80,8 @@ bool ContextMenusRemoveFunction::RunImpl() {
 
   MenuManager* manager = MenuManager::Get(GetProfile());
 
-  MenuItem::Id id(GetProfile()->IsOffTheRecord(), extension_id());
+  MenuItem::Id id(GetProfile()->IsOffTheRecord(),
+                  MenuItem::ExtensionKey(extension_id()));
   if (params->menu_item_id.as_string)
     id.string_uid = *params->menu_item_id.as_string;
   else if (params->menu_item_id.as_integer)
@@ -96,14 +99,15 @@ bool ContextMenusRemoveFunction::RunImpl() {
 
   if (!manager->RemoveContextMenuItem(id))
     return false;
-  manager->WriteToStorage(GetExtension());
+  manager->WriteToStorage(GetExtension(), id.extension_key);
   return true;
 }
 
 bool ContextMenusRemoveAllFunction::RunImpl() {
   MenuManager* manager = MenuManager::Get(GetProfile());
-  manager->RemoveAllContextItems(GetExtension()->id());
-  manager->WriteToStorage(GetExtension());
+  manager->RemoveAllContextItems(MenuItem::ExtensionKey(GetExtension()->id()));
+  manager->WriteToStorage(GetExtension(),
+                          MenuItem::ExtensionKey(GetExtension()->id()));
   return true;
 }