Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(128)

Side by Side Diff: net/url_request/url_request_context_storage.cc

Issue 2956023003: Add enable_reporting to fix size regression in Cronet. (Closed)
Patch Set: Move build_config header back to top, to fix windows Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « net/url_request/url_request_context_storage.h ('k') | net/url_request/url_request_http_job.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "net/url_request/url_request_context_storage.h" 5 #include "net/url_request/url_request_context_storage.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "net/base/network_delegate.h" 10 #include "net/base/network_delegate.h"
11 #include "net/base/proxy_delegate.h" 11 #include "net/base/proxy_delegate.h"
12 #include "net/base/sdch_manager.h" 12 #include "net/base/sdch_manager.h"
13 #include "net/cert/cert_verifier.h" 13 #include "net/cert/cert_verifier.h"
14 #include "net/cert/ct_policy_enforcer.h" 14 #include "net/cert/ct_policy_enforcer.h"
15 #include "net/cert/ct_verifier.h" 15 #include "net/cert/ct_verifier.h"
16 #include "net/cookies/cookie_store.h" 16 #include "net/cookies/cookie_store.h"
17 #include "net/dns/host_resolver.h" 17 #include "net/dns/host_resolver.h"
18 #include "net/http/http_auth_handler_factory.h" 18 #include "net/http/http_auth_handler_factory.h"
19 #include "net/http/http_server_properties.h" 19 #include "net/http/http_server_properties.h"
20 #include "net/http/http_transaction_factory.h" 20 #include "net/http/http_transaction_factory.h"
21 #include "net/log/net_log.h" 21 #include "net/log/net_log.h"
22 #include "net/proxy/proxy_service.h" 22 #include "net/proxy/proxy_service.h"
23 #include "net/reporting/reporting_service.h"
24 #include "net/ssl/channel_id_service.h" 23 #include "net/ssl/channel_id_service.h"
25 #include "net/url_request/http_user_agent_settings.h" 24 #include "net/url_request/http_user_agent_settings.h"
26 #include "net/url_request/url_request_context.h" 25 #include "net/url_request/url_request_context.h"
27 #include "net/url_request/url_request_job_factory.h" 26 #include "net/url_request/url_request_job_factory.h"
28 #include "net/url_request/url_request_throttler_manager.h" 27 #include "net/url_request/url_request_throttler_manager.h"
29 28
29 #if BUILDFLAG(ENABLE_REPORTING)
30 #include "net/reporting/reporting_service.h"
31 #endif // BUILDFLAG(ENABLE_REPORTING)
32
30 namespace net { 33 namespace net {
31 34
32 URLRequestContextStorage::URLRequestContextStorage(URLRequestContext* context) 35 URLRequestContextStorage::URLRequestContextStorage(URLRequestContext* context)
33 : context_(context) { 36 : context_(context) {
34 DCHECK(context); 37 DCHECK(context);
35 } 38 }
36 39
37 URLRequestContextStorage::~URLRequestContextStorage() {} 40 URLRequestContextStorage::~URLRequestContextStorage() {}
38 41
39 void URLRequestContextStorage::set_net_log(std::unique_ptr<NetLog> net_log) { 42 void URLRequestContextStorage::set_net_log(std::unique_ptr<NetLog> net_log) {
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 context_->set_http_user_agent_settings(http_user_agent_settings.get()); 149 context_->set_http_user_agent_settings(http_user_agent_settings.get());
147 http_user_agent_settings_ = std::move(http_user_agent_settings); 150 http_user_agent_settings_ = std::move(http_user_agent_settings);
148 } 151 }
149 152
150 void URLRequestContextStorage::set_sdch_manager( 153 void URLRequestContextStorage::set_sdch_manager(
151 std::unique_ptr<SdchManager> sdch_manager) { 154 std::unique_ptr<SdchManager> sdch_manager) {
152 context_->set_sdch_manager(sdch_manager.get()); 155 context_->set_sdch_manager(sdch_manager.get());
153 sdch_manager_ = std::move(sdch_manager); 156 sdch_manager_ = std::move(sdch_manager);
154 } 157 }
155 158
159 #if BUILDFLAG(ENABLE_REPORTING)
156 void URLRequestContextStorage::set_reporting_service( 160 void URLRequestContextStorage::set_reporting_service(
157 std::unique_ptr<ReportingService> reporting_service) { 161 std::unique_ptr<ReportingService> reporting_service) {
158 context_->set_reporting_service(reporting_service.get()); 162 context_->set_reporting_service(reporting_service.get());
159 reporting_service_ = std::move(reporting_service); 163 reporting_service_ = std::move(reporting_service);
160 } 164 }
165 #endif // BUILDFLAG(ENABLE_REPORTING)
161 166
162 } // namespace net 167 } // namespace net
OLDNEW
« no previous file with comments | « net/url_request/url_request_context_storage.h ('k') | net/url_request/url_request_http_job.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698