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

Side by Side Diff: headless/lib/browser/headless_url_request_context_getter.cc

Issue 2839153002: Revert of headless: Add support for net logging (Closed)
Patch Set: Created 3 years, 7 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "headless/lib/browser/headless_url_request_context_getter.h" 5 #include "headless/lib/browser/headless_url_request_context_getter.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/memory/ptr_util.h" 11 #include "base/memory/ptr_util.h"
12 #include "base/single_thread_task_runner.h" 12 #include "base/single_thread_task_runner.h"
13 #include "content/public/browser/browser_thread.h" 13 #include "content/public/browser/browser_thread.h"
14 #include "headless/lib/browser/headless_browser_context_options.h" 14 #include "headless/lib/browser/headless_browser_context_options.h"
15 #include "headless/lib/browser/headless_network_delegate.h" 15 #include "headless/lib/browser/headless_network_delegate.h"
16 #include "net/dns/mapped_host_resolver.h" 16 #include "net/dns/mapped_host_resolver.h"
17 #include "net/proxy/proxy_service.h" 17 #include "net/proxy/proxy_service.h"
18 #include "net/url_request/url_request_context.h" 18 #include "net/url_request/url_request_context.h"
19 #include "net/url_request/url_request_context_builder.h" 19 #include "net/url_request/url_request_context_builder.h"
20 20
21 namespace headless { 21 namespace headless {
22 22
23 HeadlessURLRequestContextGetter::HeadlessURLRequestContextGetter( 23 HeadlessURLRequestContextGetter::HeadlessURLRequestContextGetter(
24 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner, 24 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
25 scoped_refptr<base::SingleThreadTaskRunner> file_task_runner, 25 scoped_refptr<base::SingleThreadTaskRunner> file_task_runner,
26 content::ProtocolHandlerMap* protocol_handlers, 26 content::ProtocolHandlerMap* protocol_handlers,
27 ProtocolHandlerMap context_protocol_handlers, 27 ProtocolHandlerMap context_protocol_handlers,
28 content::URLRequestInterceptorScopedVector request_interceptors, 28 content::URLRequestInterceptorScopedVector request_interceptors,
29 HeadlessBrowserContextOptions* options, 29 HeadlessBrowserContextOptions* options)
30 net::NetLog* net_log)
31 : io_task_runner_(std::move(io_task_runner)), 30 : io_task_runner_(std::move(io_task_runner)),
32 file_task_runner_(std::move(file_task_runner)), 31 file_task_runner_(std::move(file_task_runner)),
33 user_agent_(options->user_agent()), 32 user_agent_(options->user_agent()),
34 host_resolver_rules_(options->host_resolver_rules()), 33 host_resolver_rules_(options->host_resolver_rules()),
35 proxy_server_(options->proxy_server()), 34 proxy_server_(options->proxy_server()),
36 request_interceptors_(std::move(request_interceptors)), 35 request_interceptors_(std::move(request_interceptors)) {
37 net_log_(net_log) {
38 // Must first be created on the UI thread. 36 // Must first be created on the UI thread.
39 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); 37 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
40 38
41 std::swap(protocol_handlers_, *protocol_handlers); 39 std::swap(protocol_handlers_, *protocol_handlers);
42 40
43 for (auto& pair : context_protocol_handlers) { 41 for (auto& pair : context_protocol_handlers) {
44 protocol_handlers_[pair.first] = 42 protocol_handlers_[pair.first] =
45 linked_ptr<net::URLRequestJobFactory::ProtocolHandler>( 43 linked_ptr<net::URLRequestJobFactory::ProtocolHandler>(
46 pair.second.release()); 44 pair.second.release());
47 } 45 }
(...skipping 25 matching lines...) Expand all
73 if (!proxy_server_.IsEmpty()) { 71 if (!proxy_server_.IsEmpty()) {
74 builder.set_proxy_service( 72 builder.set_proxy_service(
75 net::ProxyService::CreateFixed(proxy_server_.ToString())); 73 net::ProxyService::CreateFixed(proxy_server_.ToString()));
76 } else { 74 } else {
77 builder.set_proxy_config_service(std::move(proxy_config_service_)); 75 builder.set_proxy_config_service(std::move(proxy_config_service_));
78 } 76 }
79 builder.set_network_delegate(base::MakeUnique<HeadlessNetworkDelegate>()); 77 builder.set_network_delegate(base::MakeUnique<HeadlessNetworkDelegate>());
80 78
81 if (!host_resolver_rules_.empty()) { 79 if (!host_resolver_rules_.empty()) {
82 std::unique_ptr<net::HostResolver> host_resolver( 80 std::unique_ptr<net::HostResolver> host_resolver(
83 net::HostResolver::CreateDefaultResolver(net_log_)); 81 net::HostResolver::CreateDefaultResolver(nullptr /* net_log */));
84 std::unique_ptr<net::MappedHostResolver> mapped_host_resolver( 82 std::unique_ptr<net::MappedHostResolver> mapped_host_resolver(
85 new net::MappedHostResolver(std::move(host_resolver))); 83 new net::MappedHostResolver(std::move(host_resolver)));
86 mapped_host_resolver->SetRulesFromString(host_resolver_rules_); 84 mapped_host_resolver->SetRulesFromString(host_resolver_rules_);
87 builder.set_host_resolver(std::move(mapped_host_resolver)); 85 builder.set_host_resolver(std::move(mapped_host_resolver));
88 } 86 }
89 87
90 for (auto& pair : protocol_handlers_) { 88 for (auto& pair : protocol_handlers_) {
91 builder.SetProtocolHandler(pair.first, 89 builder.SetProtocolHandler(pair.first,
92 base::WrapUnique(pair.second.release())); 90 base::WrapUnique(pair.second.release()));
93 } 91 }
94 protocol_handlers_.clear(); 92 protocol_handlers_.clear();
95 builder.SetInterceptors(std::move(request_interceptors_)); 93 builder.SetInterceptors(std::move(request_interceptors_));
96 94
97 url_request_context_ = builder.Build(); 95 url_request_context_ = builder.Build();
98 url_request_context_->set_net_log(net_log_);
99 } 96 }
100 97
101 return url_request_context_.get(); 98 return url_request_context_.get();
102 } 99 }
103 100
104 scoped_refptr<base::SingleThreadTaskRunner> 101 scoped_refptr<base::SingleThreadTaskRunner>
105 HeadlessURLRequestContextGetter::GetNetworkTaskRunner() const { 102 HeadlessURLRequestContextGetter::GetNetworkTaskRunner() const {
106 return content::BrowserThread::GetTaskRunnerForThread( 103 return content::BrowserThread::GetTaskRunnerForThread(
107 content::BrowserThread::IO); 104 content::BrowserThread::IO);
108 } 105 }
109 106
110 net::HostResolver* HeadlessURLRequestContextGetter::host_resolver() const { 107 net::HostResolver* HeadlessURLRequestContextGetter::host_resolver() const {
111 return url_request_context_->host_resolver(); 108 return url_request_context_->host_resolver();
112 } 109 }
113 110
114 } // namespace headless 111 } // namespace headless
OLDNEW
« no previous file with comments | « headless/lib/browser/headless_url_request_context_getter.h ('k') | headless/lib/headless_browser_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698