Index: content/browser/browser_main_loop.cc |
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc |
index 3b4128fccff1188906bae3c2f9a76a7af4fc0815..9c72f70a3a5ce285e7257990ada1f3840b1e0fcc 100644 |
--- a/content/browser/browser_main_loop.cc |
+++ b/content/browser/browser_main_loop.cc |
@@ -53,6 +53,7 @@ |
#include "components/tracing/common/trace_to_console.h" |
#include "components/tracing/common/tracing_switches.h" |
#include "content/browser/browser_thread_impl.h" |
+#include "content/browser/child_process_security_policy_impl.h" |
#include "content/browser/dom_storage/dom_storage_area.h" |
#include "content/browser/download/download_resource_handler.h" |
#include "content/browser/download/save_file_manager.h" |
@@ -797,6 +798,13 @@ void BrowserMainLoop::PostMainMessageLoopStart() { |
LevelDBWrapperImpl::EnableAggressiveCommitDelay(); |
} |
+ if (parsed_command_line_.HasSwitch(switches::kIsolateOrigins)) { |
+ ChildProcessSecurityPolicyImpl* policy = |
+ ChildProcessSecurityPolicyImpl::GetInstance(); |
+ policy->AddIsolatedOriginsFromCommandLine( |
+ parsed_command_line_.GetSwitchValueASCII(switches::kIsolateOrigins)); |
+ } |
+ |
// Create the memory instrumentation service. It will initialize the memory |
// dump manager, too. It makes sense that BrowserMainLoop owns the service; |
// this way, the service is alive for the lifetime of Mojo. Mojo is shutdown |