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

Side by Side Diff: device/test/usb_test_gadget_impl.cc

Issue 1303493002: Make UrlRequestContextBuilder take scoped_ptr's (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sync and fix tiny resulting build failure Created 5 years, 3 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 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 "device/test/usb_test_gadget.h" 5 #include "device/test/usb_test_gadget.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 public: 136 public:
137 URLRequestContextGetter( 137 URLRequestContextGetter(
138 scoped_refptr<base::SingleThreadTaskRunner> network_task_runner) 138 scoped_refptr<base::SingleThreadTaskRunner> network_task_runner)
139 : network_task_runner_(network_task_runner) {} 139 : network_task_runner_(network_task_runner) {}
140 140
141 private: 141 private:
142 ~URLRequestContextGetter() override {} 142 ~URLRequestContextGetter() override {}
143 143
144 // net::URLRequestContextGetter implementation 144 // net::URLRequestContextGetter implementation
145 net::URLRequestContext* GetURLRequestContext() override { 145 net::URLRequestContext* GetURLRequestContext() override {
146 context_builder_.set_proxy_service(net::ProxyService::CreateDirect()); 146 if (!context_) {
147 return context_builder_.Build(); 147 net::URLRequestContextBuilder context_builder;
148 context_builder.set_proxy_service(
149 make_scoped_ptr(net::ProxyService::CreateDirect()));
150 context_ = context_builder.Build().Pass();
151 }
152 return context_.get();
148 } 153 }
149 154
150 scoped_refptr<base::SingleThreadTaskRunner> GetNetworkTaskRunner() 155 scoped_refptr<base::SingleThreadTaskRunner> GetNetworkTaskRunner()
151 const override { 156 const override {
152 return network_task_runner_; 157 return network_task_runner_;
153 } 158 }
154 159
155 net::URLRequestContextBuilder context_builder_; 160 scoped_ptr<net::URLRequestContext> context_;
156 scoped_refptr<base::SingleThreadTaskRunner> network_task_runner_; 161 scoped_refptr<base::SingleThreadTaskRunner> network_task_runner_;
157 }; 162 };
158 163
159 class URLFetcherDelegate : public net::URLFetcherDelegate { 164 class URLFetcherDelegate : public net::URLFetcherDelegate {
160 public: 165 public:
161 URLFetcherDelegate() {} 166 URLFetcherDelegate() {}
162 ~URLFetcherDelegate() override {} 167 ~URLFetcherDelegate() override {}
163 168
164 void WaitForCompletion() { run_loop_.Run(); } 169 void WaitForCompletion() { run_loop_.Run(); }
165 170
(...skipping 437 matching lines...) Expand 10 before | Expand all | Expand 10 after
603 return false; 608 return false;
604 } 609 }
605 610
606 DeviceAddListener add_listener(usb_service_, device_address_, -1); 611 DeviceAddListener add_listener(usb_service_, device_address_, -1);
607 device_ = add_listener.WaitForAdd(); 612 device_ = add_listener.WaitForAdd();
608 DCHECK(device_.get()); 613 DCHECK(device_.get());
609 return true; 614 return true;
610 } 615 }
611 616
612 } // namespace device 617 } // namespace device
OLDNEW
« no previous file with comments | « components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.cc ('k') | mojo/services/network/network_context.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698