Update process sharing rules for hosted and isolated apps.

chrome/browser/extensions/extension_info_map.cc

 // Copyright (c) 2011 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 "chrome/browser/extensions/extension_info_map.h"
 
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_set.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 90 matching lines @@
 }
 
 bool ExtensionInfoMap::CanCrossIncognito(const Extension* extension) {
   // This is duplicated from ExtensionService :(.
   return IsIncognitoEnabled(extension->id()) &&
       !extension->incognito_split_mode();
 }
 
 void ExtensionInfoMap::RegisterExtensionProcess(const std::string& extension_id,
                                                 int process_id) {
-  if (!process_map_.Insert(extension_id, process_id)) {
-    NOTREACHED() << "Duplicate extension process registration for: "
-                 << extension_id << "," << process_id << ".";

[Charlie Reis, 2011/11/23 23:46:54]

aa: I was hitting this NOTREACHED when loading a second instance of the same
hosted app.  This will usually go into a new process, but it may share a process
if we're over the limit.

I've filed http://crbug.com/105328 to figure out the right solution, since this
won't work.

-  }
+  // An extension may be added multiple times for the same process, such as
+  // multiple instances of the same hosted app once the process limit is
+  // reached.
+  process_map_.Insert(extension_id, process_id);
 }
 
 void ExtensionInfoMap::UnregisterExtensionProcess(
     const std::string& extension_id,
     int process_id) {
   if (!process_map_.Remove(extension_id, process_id)) {
     NOTREACHED() << "Unknown extension process registration for: "
                  << extension_id << "," << process_id << ".";
   }
 }
@@ skipping 14 matching lines @@
   ExtensionSet::ExtensionMap::const_iterator i = extensions_.begin();
   for (; i != extensions_.end(); ++i) {
     if (i->second->web_extent().MatchesSecurityOrigin(origin) &&
         process_map_.Contains(i->first, process_id) &&
         i->second->HasAPIPermission(permission)) {
       return true;
     }
   }
   return false;
 }