OLD | NEW |
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 "remoting/base/chromium_url_request.h" | 5 #include "remoting/base/chromium_url_request.h" |
6 | 6 |
7 #include "base/callback_helpers.h" | 7 #include "base/callback_helpers.h" |
8 #include "base/memory/ptr_util.h" | 8 #include "base/memory/ptr_util.h" |
9 #include "net/base/load_flags.h" | 9 #include "net/base/load_flags.h" |
10 #include "net/url_request/url_fetcher.h" | 10 #include "net/url_request/url_fetcher.h" |
11 #include "net/url_request/url_request_context_getter.h" | 11 #include "net/url_request/url_request_context_getter.h" |
12 | 12 |
13 namespace remoting { | 13 namespace remoting { |
14 | 14 |
15 ChromiumUrlRequest::ChromiumUrlRequest( | 15 ChromiumUrlRequest::ChromiumUrlRequest( |
16 scoped_refptr<net::URLRequestContextGetter> url_context, | 16 scoped_refptr<net::URLRequestContextGetter> url_context, |
17 UrlRequest::Type type, | 17 UrlRequest::Type type, |
18 const std::string& url) { | 18 const std::string& url, |
| 19 const net::NetworkTrafficAnnotationTag& traffic_annotation) { |
19 net::URLFetcher::RequestType request_type = net::URLFetcher::GET; | 20 net::URLFetcher::RequestType request_type = net::URLFetcher::GET; |
20 switch (type) { | 21 switch (type) { |
21 case Type::GET: | 22 case Type::GET: |
22 request_type = net::URLFetcher::GET; | 23 request_type = net::URLFetcher::GET; |
23 break; | 24 break; |
24 case Type::POST: | 25 case Type::POST: |
25 request_type = net::URLFetcher::POST; | 26 request_type = net::URLFetcher::POST; |
26 break; | 27 break; |
27 } | 28 } |
28 url_fetcher_ = net::URLFetcher::Create(GURL(url), request_type, this); | 29 url_fetcher_ = net::URLFetcher::Create(GURL(url), request_type, this, |
| 30 traffic_annotation); |
29 url_fetcher_->SetRequestContext(url_context.get()); | 31 url_fetcher_->SetRequestContext(url_context.get()); |
30 url_fetcher_->SetReferrer("https://chrome.google.com/remotedesktop"); | 32 url_fetcher_->SetReferrer("https://chrome.google.com/remotedesktop"); |
31 url_fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SAVE_COOKIES | | 33 url_fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SAVE_COOKIES | |
32 net::LOAD_DO_NOT_SEND_COOKIES); | 34 net::LOAD_DO_NOT_SEND_COOKIES); |
33 } | 35 } |
34 | 36 |
35 ChromiumUrlRequest::~ChromiumUrlRequest() {} | 37 ChromiumUrlRequest::~ChromiumUrlRequest() {} |
36 | 38 |
37 void ChromiumUrlRequest::AddHeader(const std::string& value) { | 39 void ChromiumUrlRequest::AddHeader(const std::string& value) { |
38 url_fetcher_->AddExtraRequestHeader(value); | 40 url_fetcher_->AddExtraRequestHeader(value); |
(...skipping 28 matching lines...) Expand all Loading... |
67 base::ResetAndReturn(&on_result_callback_).Run(result); | 69 base::ResetAndReturn(&on_result_callback_).Run(result); |
68 } | 70 } |
69 | 71 |
70 ChromiumUrlRequestFactory::ChromiumUrlRequestFactory( | 72 ChromiumUrlRequestFactory::ChromiumUrlRequestFactory( |
71 scoped_refptr<net::URLRequestContextGetter> url_context) | 73 scoped_refptr<net::URLRequestContextGetter> url_context) |
72 : url_context_(url_context) {} | 74 : url_context_(url_context) {} |
73 ChromiumUrlRequestFactory::~ChromiumUrlRequestFactory() {} | 75 ChromiumUrlRequestFactory::~ChromiumUrlRequestFactory() {} |
74 | 76 |
75 std::unique_ptr<UrlRequest> ChromiumUrlRequestFactory::CreateUrlRequest( | 77 std::unique_ptr<UrlRequest> ChromiumUrlRequestFactory::CreateUrlRequest( |
76 UrlRequest::Type type, | 78 UrlRequest::Type type, |
77 const std::string& url) { | 79 const std::string& url, |
78 return base::MakeUnique<ChromiumUrlRequest>(url_context_, type, url); | 80 const net::NetworkTrafficAnnotationTag& traffic_annotation) { |
| 81 return base::MakeUnique<ChromiumUrlRequest>(url_context_, type, url, |
| 82 traffic_annotation); |
79 } | 83 } |
80 | 84 |
81 } // namespace remoting | 85 } // namespace remoting |
OLD | NEW |