diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-12-08 10:22:59 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-12-08 12:17:14 +0000 |
| commit | 69b8f9169ffd66fdeca1ac60a4bc06b91d106186 (patch) | |
| tree | c8b7f735583d0b4e0c0b61a014a7f4b3b26e85ab /chromium/content/browser/browser_main_loop.cc | |
| parent | daa093eea7c773db06799a13bd7e4e2e2a9f8f14 (diff) | |
| download | qtwebengine-chromium-69b8f9169ffd66fdeca1ac60a4bc06b91d106186.tar.gz | |
BASELINE: Update Chromium to 63.0.3239.87
Change-Id: Iac27464730121b4fac76869d87d622504642e016
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'chromium/content/browser/browser_main_loop.cc')
| -rw-r--r-- | chromium/content/browser/browser_main_loop.cc | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/chromium/content/browser/browser_main_loop.cc b/chromium/content/browser/browser_main_loop.cc index ac6c6a3fe6d..096a17447e4 100644 --- a/chromium/content/browser/browser_main_loop.cc +++ b/chromium/content/browser/browser_main_loop.cc @@ -89,6 +89,7 @@ #include "content/browser/webui/url_data_manager.h" #include "content/common/content_switches_internal.h" #include "content/common/service_manager/service_manager_connection_impl.h" +#include "content/common/site_isolation_policy.h" #include "content/common/task_scheduler.h" #include "content/public/browser/browser_main_parts.h" #include "content/public/browser/content_browser_client.h" @@ -764,13 +765,6 @@ void BrowserMainLoop::PostMainMessageLoopStart() { LevelDBWrapperImpl::EnableAggressiveCommitDelay(); } - if (parsed_command_line_.HasSwitch(switches::kIsolateOrigins)) { - ChildProcessSecurityPolicyImpl* policy = - ChildProcessSecurityPolicyImpl::GetInstance(); - policy->AddIsolatedOriginsFromCommandLine( - parsed_command_line_.GetSwitchValueASCII(switches::kIsolateOrigins)); - } - // Enable memory-infra dump providers. InitSkiaEventTracer(); base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider( @@ -871,12 +865,11 @@ int BrowserMainLoop::PreCreateThreads() { // Initialize origins that are whitelisted for process isolation. Must be // done after base::FeatureList is initialized, but before any navigations // can happen. - std::vector<url::Origin> origins = - GetContentClient()->browser()->GetOriginsRequiringDedicatedProcess(); ChildProcessSecurityPolicyImpl* policy = ChildProcessSecurityPolicyImpl::GetInstance(); - for (auto origin : origins) - policy->AddIsolatedOrigin(origin); + policy->AddIsolatedOrigins(SiteIsolationPolicy::GetIsolatedOrigins()); + policy->AddIsolatedOrigins( + GetContentClient()->browser()->GetOriginsRequiringDedicatedProcess()); EVP_set_buggy_rsa_parser( base::FeatureList::IsEnabled(features::kBuggyRSAParser)); |