diff options
| author | mef <mef@chromium.org> | 2016-03-07 08:28:15 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-07 16:29:34 +0000 |
| commit | 99df23ce1484300e3eba3656d7c1151fc69d01b7 (patch) | |
| tree | b0b2ea441cd407c4c074258217f213417a2e3b87 /ios | |
| parent | ded5afeb2fc486424ed5c5b2b135edbd708d4a52 (diff) | |
| download | chromium_src-99df23ce1484300e3eba3656d7c1151fc69d01b7.zip chromium_src-99df23ce1484300e3eba3656d7c1151fc69d01b7.tar.gz chromium_src-99df23ce1484300e3eba3656d7c1151fc69d01b7.tar.bz2 | |
[Cronet] Don't InitializeOnNetworkThread until main_context_getter_ is created.
BUG=583085
Review URL: https://codereview.chromium.org/1732753005
Cr-Commit-Position: refs/heads/master@{#379559}
Diffstat (limited to 'ios')
| -rw-r--r-- | ios/crnet/crnet_environment.mm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ios/crnet/crnet_environment.mm b/ios/crnet/crnet_environment.mm index da98875..8a53918 100644 --- a/ios/crnet/crnet_environment.mm +++ b/ios/crnet/crnet_environment.mm @@ -9,6 +9,7 @@ #include <utility> #include "base/at_exit.h" +#include "base/atomicops.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" @@ -286,13 +287,14 @@ void CrNetEnvironment::Install() { proxy_config_service_ = net::ProxyService::CreateSystemProxyConfigService( network_io_thread_->task_runner(), nullptr); + net::SetURLRequestContextForNSSHttpIO(main_context_.get()); + main_context_getter_ = new CrNetURLRequestContextGetter( + main_context_.get(), network_io_thread_->task_runner()); + base::subtle::MemoryBarrier(); PostToNetworkThread(FROM_HERE, base::Bind(&CrNetEnvironment::InitializeOnNetworkThread, base::Unretained(this))); - net::SetURLRequestContextForNSSHttpIO(main_context_.get()); - main_context_getter_ = new CrNetURLRequestContextGetter( - main_context_.get(), network_io_thread_->task_runner()); SetRequestFilterBlock(nil); } |