OLD | NEW |
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 "cronet_url_request_adapter.h" | 5 #include "cronet_url_request_adapter.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/location.h" | 8 #include "base/location.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "components/cronet/android/cronet_url_request_context_adapter.h" | 10 #include "components/cronet/android/cronet_url_request_context_adapter.h" |
(...skipping 23 matching lines...) Expand all Loading... |
34 CronetURLRequestAdapter::~CronetURLRequestAdapter() { | 34 CronetURLRequestAdapter::~CronetURLRequestAdapter() { |
35 DCHECK(IsOnNetworkThread()); | 35 DCHECK(IsOnNetworkThread()); |
36 } | 36 } |
37 | 37 |
38 void CronetURLRequestAdapter::AddRequestHeader(const std::string& name, | 38 void CronetURLRequestAdapter::AddRequestHeader(const std::string& name, |
39 const std::string& value) { | 39 const std::string& value) { |
40 DCHECK(!IsOnNetworkThread()); | 40 DCHECK(!IsOnNetworkThread()); |
41 initial_request_headers_.SetHeader(name, value); | 41 initial_request_headers_.SetHeader(name, value); |
42 } | 42 } |
43 | 43 |
44 bool CronetURLRequestAdapter::PostTaskToNetworkThread( | 44 void CronetURLRequestAdapter::PostTaskToNetworkThread( |
45 const tracked_objects::Location& from_here, | 45 const tracked_objects::Location& from_here, |
46 const base::Closure& task) { | 46 const base::Closure& task) { |
47 DCHECK(!IsOnNetworkThread()); | 47 DCHECK(!IsOnNetworkThread()); |
48 return context_->GetNetworkTaskRunner()->PostTask(from_here, task); | 48 context_->PostTaskToNetworkThread(from_here, task); |
49 } | 49 } |
50 | 50 |
51 bool CronetURLRequestAdapter::IsOnNetworkThread() const { | 51 bool CronetURLRequestAdapter::IsOnNetworkThread() const { |
52 return context_->GetNetworkTaskRunner()->BelongsToCurrentThread(); | 52 return context_->IsOnNetworkThread(); |
53 } | 53 } |
54 | 54 |
55 void CronetURLRequestAdapter::Start() { | 55 void CronetURLRequestAdapter::Start() { |
56 DCHECK(IsOnNetworkThread()); | 56 DCHECK(IsOnNetworkThread()); |
57 VLOG(1) << "Starting chromium request: " | 57 VLOG(1) << "Starting chromium request: " |
58 << initial_url_.possibly_invalid_spec().c_str() | 58 << initial_url_.possibly_invalid_spec().c_str() |
59 << " priority: " << RequestPriorityToString(initial_priority_); | 59 << " priority: " << RequestPriorityToString(initial_priority_); |
60 url_request_ = context_->GetURLRequestContext()->CreateRequest( | 60 url_request_ = context_->GetURLRequestContext()->CreateRequest( |
61 initial_url_, net::DEFAULT_PRIORITY, this, NULL); | 61 initial_url_, net::DEFAULT_PRIORITY, this, NULL); |
62 url_request_->SetLoadFlags(context_->default_load_flags()); | 62 url_request_->SetLoadFlags(context_->default_load_flags()); |
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
149 DCHECK_EQ(request, url_request_); | 149 DCHECK_EQ(request, url_request_); |
150 if (url_request_->status().is_success()) | 150 if (url_request_->status().is_success()) |
151 return false; | 151 return false; |
152 VLOG(1) << "Error " << url_request_->status().error() | 152 VLOG(1) << "Error " << url_request_->status().error() |
153 << " on chromium request: " << initial_url_.possibly_invalid_spec(); | 153 << " on chromium request: " << initial_url_.possibly_invalid_spec(); |
154 delegate_->OnError(url_request_->status().error()); | 154 delegate_->OnError(url_request_->status().error()); |
155 return true; | 155 return true; |
156 } | 156 } |
157 | 157 |
158 } // namespace cronet | 158 } // namespace cronet |
OLD | NEW |