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