Incognito-allowed package apps produce duplicate items in context menu

chrome/browser/extensions/extension_process_manager.cc

Index: chrome/browser/extensions/extension_process_manager.cc
diff --git a/chrome/browser/extensions/extension_process_manager.cc b/chrome/browser/extensions/extension_process_manager.cc
index 6a2a88f720126915fbdb8b8eb973fe0726d4bbe3..d7b4a3cb8b69286d7384d34b83343553cf8535ce 100644
--- a/chrome/browser/extensions/extension_process_manager.cc
+++ b/chrome/browser/extensions/extension_process_manager.cc
@@ -622,6 +622,13 @@ void ExtensionProcessManager::Observe(
     }
 
     case chrome::NOTIFICATION_PROFILE_DESTROYED: {
+      // Remove "incognito" "split" mode context menu items.
+      Profile* profile = content::Source<Profile>(source).ptr();

[Yoyo Zhou, 2012/10/29 21:26:51]

Note that only the incognito profile's ExtensionProcessManager will see this
event from the incognito profile. So you could do this cleanup in the destructor
of IncognitoExtensionProcessManager instead, since it has the same lifetime as
the incognito profile.

This is probably okay for now (to fix this bug), but there's definitely a
modularity issue, since this code isn't related to the ExtensionProcessManager,
but only to the lifetime of the incognito profile. Can you add a
TODO(yoz): This cleanup code belongs in the MenuManager.

+      if (profile->IsOffTheRecord()) {
+          ExtensionService* service =
+            extensions::ExtensionSystem::Get(profile)->extension_service();
+          service->menu_manager()->RemoveAllIncognitoContextItems();
+      }
       // Close background hosts when the last browser is closed so that they
       // have time to shutdown various objects on different threads. Our
       // destructor is called too late in the shutdown sequence.