Incognito-allowed package apps produce duplicate items in context menu

chrome/browser/extensions/extension_process_manager.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
@@ skipping 48 matching lines @@
 
   return render_view_host->GetSiteInstance()->GetSiteURL().host();
 }
 
 // Incognito profiles use this process manager. It is mostly a shim that decides
 // whether to fall back on the original profile's ExtensionProcessManager based
 // on whether a given extension uses "split" or "spanning" incognito behavior.
 class IncognitoExtensionProcessManager : public ExtensionProcessManager {
  public:
   explicit IncognitoExtensionProcessManager(Profile* profile);
-  virtual ~IncognitoExtensionProcessManager() {}
+  virtual ~IncognitoExtensionProcessManager();
   virtual ExtensionHost* CreateViewHost(
       const Extension* extension,
       const GURL& url,
       Browser* browser,
       chrome::ViewType view_type) OVERRIDE;
   virtual void CreateBackgroundHost(const Extension* extension,
                                     const GURL& url);
   virtual SiteInstance* GetSiteInstanceForURL(const GURL& url);
 
  private:
@@ skipping 735 matching lines @@
           CreateBackgroundHostsForProfileStartup(GetProfile(),
                                                  this, service->extensions());
       }
       break;
     }
     default:
       ExtensionProcessManager::Observe(type, source, details);
       break;
   }
 }
+
+IncognitoExtensionProcessManager::~IncognitoExtensionProcessManager() {

[Yoyo Zhou, 2012/10/29 22:23:40]

Please keep the function definitions in the same order as the declarations. (You
can also move ExtensionProcessManager::ViewSet to a more correct location in
this file.)

[Joe Thomas, 2012/10/29 23:04:42]

Done.

Apparently there are other functions in ExtensionProcessManager and
IncognitoExtensionProcessManager which are out-of-order. I will create a CL to
correct that once this lands. 

+  // TODO(yoz): This cleanup code belongs in the MenuManager.
+  // Remove "incognito" "split" mode context menu items.
+  ExtensionService* service =
+      extensions::ExtensionSystem::Get(GetProfile())->extension_service();
+  service->menu_manager()->RemoveAllIncognitoContextItems();
+}