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

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

Issue 2748743002: Headless: Strip X-DevTools-Emulate-Network-Conditions-Client-Id (Closed)
Patch Set: Change capitalization Created 3 years, 9 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 "net/dns/mapped_host_resolver.h" 16 #include "net/dns/mapped_host_resolver.h"
16 #include "net/proxy/proxy_service.h" 17 #include "net/proxy/proxy_service.h"
17 #include "net/url_request/url_request_context.h" 18 #include "net/url_request/url_request_context.h"
18 #include "net/url_request/url_request_context_builder.h" 19 #include "net/url_request/url_request_context_builder.h"
19 20
20 namespace headless { 21 namespace headless {
21 22
22 HeadlessURLRequestContextGetter::HeadlessURLRequestContextGetter( 23 HeadlessURLRequestContextGetter::HeadlessURLRequestContextGetter(
23 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner, 24 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
24 scoped_refptr<base::SingleThreadTaskRunner> file_task_runner, 25 scoped_refptr<base::SingleThreadTaskRunner> file_task_runner,
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 builder.set_data_enabled(true); 67 builder.set_data_enabled(true);
67 builder.set_file_enabled(true); 68 builder.set_file_enabled(true);
68 builder.SetFileTaskRunner(content::BrowserThread::GetTaskRunnerForThread( 69 builder.SetFileTaskRunner(content::BrowserThread::GetTaskRunnerForThread(
69 content::BrowserThread::FILE)); 70 content::BrowserThread::FILE));
70 if (!proxy_server_.IsEmpty()) { 71 if (!proxy_server_.IsEmpty()) {
71 builder.set_proxy_service( 72 builder.set_proxy_service(
72 net::ProxyService::CreateFixed(proxy_server_.ToString())); 73 net::ProxyService::CreateFixed(proxy_server_.ToString()));
73 } else { 74 } else {
74 builder.set_proxy_config_service(std::move(proxy_config_service_)); 75 builder.set_proxy_config_service(std::move(proxy_config_service_));
75 } 76 }
77 builder.set_network_delegate(base::MakeUnique<HeadlessNetworkDelegate>());
76 78
77 if (!host_resolver_rules_.empty()) { 79 if (!host_resolver_rules_.empty()) {
78 std::unique_ptr<net::HostResolver> host_resolver( 80 std::unique_ptr<net::HostResolver> host_resolver(
79 net::HostResolver::CreateDefaultResolver(nullptr /* net_log */)); 81 net::HostResolver::CreateDefaultResolver(nullptr /* net_log */));
80 std::unique_ptr<net::MappedHostResolver> mapped_host_resolver( 82 std::unique_ptr<net::MappedHostResolver> mapped_host_resolver(
81 new net::MappedHostResolver(std::move(host_resolver))); 83 new net::MappedHostResolver(std::move(host_resolver)));
82 mapped_host_resolver->SetRulesFromString(host_resolver_rules_); 84 mapped_host_resolver->SetRulesFromString(host_resolver_rules_);
83 builder.set_host_resolver(std::move(mapped_host_resolver)); 85 builder.set_host_resolver(std::move(mapped_host_resolver));
84 } 86 }
85 87
(...skipping 14 matching lines...) Expand all
100 HeadlessURLRequestContextGetter::GetNetworkTaskRunner() const { 102 HeadlessURLRequestContextGetter::GetNetworkTaskRunner() const {
101 return content::BrowserThread::GetTaskRunnerForThread( 103 return content::BrowserThread::GetTaskRunnerForThread(
102 content::BrowserThread::IO); 104 content::BrowserThread::IO);
103 } 105 }
104 106
105 net::HostResolver* HeadlessURLRequestContextGetter::host_resolver() const { 107 net::HostResolver* HeadlessURLRequestContextGetter::host_resolver() const {
106 return url_request_context_->host_resolver(); 108 return url_request_context_->host_resolver();
107 } 109 }
108 110
109 } // namespace headless 111 } // namespace headless
OLDNEW
« no previous file with comments | « headless/lib/browser/headless_network_delegate.cc ('k') | headless/lib/headless_devtools_client_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698