OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "mojo/services/network/network_context.h" | 5 #include "mojo/services/network/network_context.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <utility> |
8 #include <vector> | 9 #include <vector> |
9 | 10 |
10 #include "base/base_paths.h" | 11 #include "base/base_paths.h" |
11 #include "base/bind.h" | 12 #include "base/bind.h" |
12 #include "base/command_line.h" | 13 #include "base/command_line.h" |
13 #include "base/logging.h" | 14 #include "base/logging.h" |
14 #include "base/path_service.h" | 15 #include "base/path_service.h" |
15 #include "base/strings/string_number_conversions.h" | 16 #include "base/strings/string_number_conversions.h" |
16 #include "mojo/common/user_agent.h" | 17 #include "mojo/common/user_agent.h" |
17 #include "mojo/services/network/mojo_persistent_cookie_store.h" | 18 #include "mojo/services/network/mojo_persistent_cookie_store.h" |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
72 #elif defined(OS_POSIX) | 73 #elif defined(OS_POSIX) |
73 file.reset(fopen(log_path.value().c_str(), "w")); | 74 file.reset(fopen(log_path.value().c_str(), "w")); |
74 #endif | 75 #endif |
75 if (!file) { | 76 if (!file) { |
76 LOG(ERROR) << "Could not open file " << log_path.value() | 77 LOG(ERROR) << "Could not open file " << log_path.value() |
77 << " for net logging"; | 78 << " for net logging"; |
78 } else { | 79 } else { |
79 write_to_file_observer_.reset(new net::WriteToFileNetLogObserver()); | 80 write_to_file_observer_.reset(new net::WriteToFileNetLogObserver()); |
80 write_to_file_observer_->set_capture_mode( | 81 write_to_file_observer_->set_capture_mode( |
81 net::NetLogCaptureMode::IncludeCookiesAndCredentials()); | 82 net::NetLogCaptureMode::IncludeCookiesAndCredentials()); |
82 write_to_file_observer_->StartObserving(this, file.Pass(), nullptr, | 83 write_to_file_observer_->StartObserving(this, std::move(file), nullptr, |
83 nullptr); | 84 nullptr); |
84 } | 85 } |
85 } | 86 } |
86 | 87 |
87 ~MojoNetLog() override { | 88 ~MojoNetLog() override { |
88 if (write_to_file_observer_) | 89 if (write_to_file_observer_) |
89 write_to_file_observer_->StopObserving(nullptr); | 90 write_to_file_observer_->StopObserving(nullptr); |
90 } | 91 } |
91 | 92 |
92 private: | 93 private: |
93 scoped_ptr<net::WriteToFileNetLogObserver> write_to_file_observer_; | 94 scoped_ptr<net::WriteToFileNetLogObserver> write_to_file_observer_; |
94 | 95 |
95 DISALLOW_COPY_AND_ASSIGN(MojoNetLog); | 96 DISALLOW_COPY_AND_ASSIGN(MojoNetLog); |
96 }; | 97 }; |
97 | 98 |
98 NetworkContext::NetworkContext( | 99 NetworkContext::NetworkContext( |
99 scoped_ptr<net::URLRequestContext> url_request_context) | 100 scoped_ptr<net::URLRequestContext> url_request_context) |
100 : net_log_(new MojoNetLog), | 101 : net_log_(new MojoNetLog), |
101 url_request_context_(url_request_context.Pass()), | 102 url_request_context_(std::move(url_request_context)), |
102 in_shutdown_(false) { | 103 in_shutdown_(false) { |
103 url_request_context_->set_net_log(net_log_.get()); | 104 url_request_context_->set_net_log(net_log_.get()); |
104 } | 105 } |
105 | 106 |
106 NetworkContext::NetworkContext( | 107 NetworkContext::NetworkContext( |
107 const base::FilePath& base_path, | 108 const base::FilePath& base_path, |
108 const scoped_refptr<base::SequencedTaskRunner>& background_task_runner, | 109 const scoped_refptr<base::SequencedTaskRunner>& background_task_runner, |
109 NetworkServiceDelegate* delegate) | 110 NetworkServiceDelegate* delegate) |
110 : NetworkContext(MakeURLRequestContext(base_path, background_task_runner, | 111 : NetworkContext(MakeURLRequestContext(base_path, background_task_runner, |
111 delegate)) { | 112 delegate)) { |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
158 if (command_line->HasSwitch(kTestingFixedHttpsPort)) { | 159 if (command_line->HasSwitch(kTestingFixedHttpsPort)) { |
159 params.testing_fixed_https_port = | 160 params.testing_fixed_https_port = |
160 GetPortNumber(*command_line, kTestingFixedHttpsPort); | 161 GetPortNumber(*command_line, kTestingFixedHttpsPort); |
161 } | 162 } |
162 builder.set_http_network_session_params(params); | 163 builder.set_http_network_session_params(params); |
163 | 164 |
164 if (command_line->HasSwitch(kHostResolverRules)) { | 165 if (command_line->HasSwitch(kHostResolverRules)) { |
165 scoped_ptr<net::HostResolver> host_resolver( | 166 scoped_ptr<net::HostResolver> host_resolver( |
166 net::HostResolver::CreateDefaultResolver(nullptr)); | 167 net::HostResolver::CreateDefaultResolver(nullptr)); |
167 scoped_ptr<net::MappedHostResolver> remapped_host_resolver( | 168 scoped_ptr<net::MappedHostResolver> remapped_host_resolver( |
168 new net::MappedHostResolver(host_resolver.Pass())); | 169 new net::MappedHostResolver(std::move(host_resolver))); |
169 remapped_host_resolver->SetRulesFromString( | 170 remapped_host_resolver->SetRulesFromString( |
170 command_line->GetSwitchValueASCII(kHostResolverRules)); | 171 command_line->GetSwitchValueASCII(kHostResolverRules)); |
171 builder.set_host_resolver(remapped_host_resolver.Pass()); | 172 builder.set_host_resolver(std::move(remapped_host_resolver)); |
172 } | 173 } |
173 | 174 |
174 builder.set_accept_language("en-us,en"); | 175 builder.set_accept_language("en-us,en"); |
175 builder.set_user_agent(mojo::common::GetUserAgent()); | 176 builder.set_user_agent(mojo::common::GetUserAgent()); |
176 builder.set_proxy_service(net::ProxyService::CreateDirect()); | 177 builder.set_proxy_service(net::ProxyService::CreateDirect()); |
177 builder.set_transport_security_persister_path(base_path); | 178 builder.set_transport_security_persister_path(base_path); |
178 | 179 |
179 net::URLRequestContextBuilder::HttpCacheParams cache_params; | 180 net::URLRequestContextBuilder::HttpCacheParams cache_params; |
180 #if defined(OS_ANDROID) | 181 #if defined(OS_ANDROID) |
181 // On Android, we store the cache on disk becase we can run only a single | 182 // On Android, we store the cache on disk becase we can run only a single |
(...skipping 20 matching lines...) Expand all Loading... |
202 delegate, | 203 delegate, |
203 base::FilePath(FILE_PATH_LITERAL("Cookies")), | 204 base::FilePath(FILE_PATH_LITERAL("Cookies")), |
204 base::MessageLoop::current()->task_runner(), | 205 base::MessageLoop::current()->task_runner(), |
205 background_task_runner, | 206 background_task_runner, |
206 false, // TODO(erg): Make RESTORED_SESSION_COOKIES configurable. | 207 false, // TODO(erg): Make RESTORED_SESSION_COOKIES configurable. |
207 nullptr); | 208 nullptr); |
208 builder.SetCookieAndChannelIdStores( | 209 builder.SetCookieAndChannelIdStores( |
209 new net::CookieMonster(cookie_store, nullptr), nullptr); | 210 new net::CookieMonster(cookie_store, nullptr), nullptr); |
210 } | 211 } |
211 | 212 |
212 return builder.Build().Pass(); | 213 return builder.Build(); |
213 } | 214 } |
214 | 215 |
215 } // namespace mojo | 216 } // namespace mojo |
OLD | NEW |