Disarm LockToOrigin for extensions under --isolate-extensions.

chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc

 // Copyright 2014 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/chrome_content_browser_client_extensions_part.h"
 
 #include <stddef.h>
 
 #include <set>
 
@@ skipping 200 matching lines @@
   // https://crbug.com/160576 workaround: Origin lock to the chrome-extension://
   // scheme for a hosted app would kill processes on legitimate requests for the
   // app's cookies.
   if (effective_site_url.SchemeIs(extensions::kExtensionScheme)) {
     const Extension* extension =
         ExtensionRegistry::Get(browser_context)
             ->enabled_extensions()
             .GetExtensionOrAppByURL(effective_site_url);
     if (extension && extension->is_hosted_app())
       return false;
+
+    // http://crbug.com/600441 workaround - Extension process reuse (implemented
+    // above, in ShouldTryToUseExistingProcessHost) means that extension

[Devlin, 2016/04/07 15:06:37]

nit: actually implemented below, right?  Might be worth just saying "implemented
in Should..."

[ncarter (slow), 2016/04/07 21:41:09]

Done.

+    // processes aren't always actually dedicated to a single origin, even in
+    // --isolate-extensions. TODO(nick): Fix this.
+    if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+            ::switches::kSitePerProcess))
+      return false;
   }
   return true;
 }
 
 // static
 bool ChromeContentBrowserClientExtensionsPart::CanCommitURL(
     content::RenderProcessHost* process_host, const GURL& url) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   // We need to let most extension URLs commit in any process, since this can
@@ skipping 382 matching lines @@
     command_line->AppendSwitch(::switches::kEnableWebRtcHWH264Encoding);
 #endif
     if (base::CommandLine::ForCurrentProcess()->HasSwitch(
             switches::kEnableMojoSerialService)) {
       command_line->AppendSwitch(switches::kEnableMojoSerialService);
     }
   }
 }
 
 }  // namespace extensions