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

Side by Side Diff: remoting/base/url_request_context_getter.cc

Issue 1545723002: Use std::move() instead of .Pass() in remoting/* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move_not_pass_host
Patch Set: Created 4 years, 12 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 | « remoting/base/typed_buffer_unittest.cc ('k') | remoting/client/audio_decode_scheduler.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 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 "remoting/base/url_request_context_getter.h" 5 #include "remoting/base/url_request_context_getter.h"
6 6
7 #include <utility>
8
7 #include "base/single_thread_task_runner.h" 9 #include "base/single_thread_task_runner.h"
8 #include "net/proxy/proxy_config_service.h" 10 #include "net/proxy/proxy_config_service.h"
9 #include "net/url_request/url_request_context.h" 11 #include "net/url_request/url_request_context.h"
10 #include "net/url_request/url_request_context_builder.h" 12 #include "net/url_request/url_request_context_builder.h"
11 #include "remoting/base/vlog_net_log.h" 13 #include "remoting/base/vlog_net_log.h"
12 14
13 namespace remoting { 15 namespace remoting {
14 16
15 URLRequestContextGetter::URLRequestContextGetter( 17 URLRequestContextGetter::URLRequestContextGetter(
16 scoped_refptr<base::SingleThreadTaskRunner> network_task_runner, 18 scoped_refptr<base::SingleThreadTaskRunner> network_task_runner,
17 scoped_refptr<base::SingleThreadTaskRunner> file_task_runner) 19 scoped_refptr<base::SingleThreadTaskRunner> file_task_runner)
18 : network_task_runner_(network_task_runner), 20 : network_task_runner_(network_task_runner),
19 file_task_runner_(file_task_runner), 21 file_task_runner_(file_task_runner),
20 proxy_config_service_( 22 proxy_config_service_(
21 net::ProxyService::CreateSystemProxyConfigService( 23 net::ProxyService::CreateSystemProxyConfigService(
22 network_task_runner, file_task_runner)) {} 24 network_task_runner, file_task_runner)) {}
23 25
24 net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() { 26 net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() {
25 if (!url_request_context_.get()) { 27 if (!url_request_context_.get()) {
26 net::URLRequestContextBuilder builder; 28 net::URLRequestContextBuilder builder;
27 builder.SetFileTaskRunner(file_task_runner_); 29 builder.SetFileTaskRunner(file_task_runner_);
28 net_log_.reset(new VlogNetLog()); 30 net_log_.reset(new VlogNetLog());
29 builder.set_net_log(net_log_.get()); 31 builder.set_net_log(net_log_.get());
30 builder.DisableHttpCache(); 32 builder.DisableHttpCache();
31 builder.set_proxy_config_service(proxy_config_service_.Pass()); 33 builder.set_proxy_config_service(std::move(proxy_config_service_));
32 url_request_context_ = builder.Build().Pass(); 34 url_request_context_ = builder.Build();
33 } 35 }
34 return url_request_context_.get(); 36 return url_request_context_.get();
35 } 37 }
36 38
37 scoped_refptr<base::SingleThreadTaskRunner> 39 scoped_refptr<base::SingleThreadTaskRunner>
38 URLRequestContextGetter::GetNetworkTaskRunner() const { 40 URLRequestContextGetter::GetNetworkTaskRunner() const {
39 return network_task_runner_; 41 return network_task_runner_;
40 } 42 }
41 43
42 URLRequestContextGetter::~URLRequestContextGetter() { 44 URLRequestContextGetter::~URLRequestContextGetter() {
43 } 45 }
44 46
45 } // namespace remoting 47 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/base/typed_buffer_unittest.cc ('k') | remoting/client/audio_decode_scheduler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698