Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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_bidirectional_stream_adapter.h" | 5 #include "cronet_bidirectional_stream_adapter.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 308 DCHECK(context_->IsOnNetworkThread()); | 308 DCHECK(context_->IsOnNetworkThread()); |
| 309 JNIEnv* env = base::android::AttachCurrentThread(); | 309 JNIEnv* env = base::android::AttachCurrentThread(); |
| 310 cronet::Java_CronetBidirectionalStream_onResponseTrailersReceived( | 310 cronet::Java_CronetBidirectionalStream_onResponseTrailersReceived( |
| 311 env, owner_.obj(), GetHeadersArray(env, response_trailers).obj()); | 311 env, owner_.obj(), GetHeadersArray(env, response_trailers).obj()); |
| 312 } | 312 } |
| 313 | 313 |
| 314 void CronetBidirectionalStreamAdapter::OnFailed(int error) { | 314 void CronetBidirectionalStreamAdapter::OnFailed(int error) { |
| 315 DCHECK(context_->IsOnNetworkThread()); | 315 DCHECK(context_->IsOnNetworkThread()); |
| 316 stream_failed_ = true; | 316 stream_failed_ = true; |
| 317 JNIEnv* env = base::android::AttachCurrentThread(); | 317 JNIEnv* env = base::android::AttachCurrentThread(); |
| 318 // TODO(mgersh): Add support for NetErrorDetails | |
| 318 cronet::Java_CronetBidirectionalStream_onError( | 319 cronet::Java_CronetBidirectionalStream_onError( |
| 319 env, owner_.obj(), NetErrorToUrlRequestError(error), error, | 320 env, owner_.obj(), NetErrorToUrlRequestError(error), error, 0, |
|
pauljensen
2016/06/17 12:05:59
0 -> QUIC_NO_ERROR
mgersh
2016/06/29 23:01:09
Done (here and in the next file)
| |
| 320 ConvertUTF8ToJavaString(env, net::ErrorToString(error)).obj(), | 321 ConvertUTF8ToJavaString(env, net::ErrorToString(error)).obj(), |
| 321 bidi_stream_->GetTotalReceivedBytes()); | 322 bidi_stream_->GetTotalReceivedBytes()); |
| 322 } | 323 } |
| 323 | 324 |
| 324 void CronetBidirectionalStreamAdapter::StartOnNetworkThread( | 325 void CronetBidirectionalStreamAdapter::StartOnNetworkThread( |
| 325 std::unique_ptr<net::BidirectionalStreamRequestInfo> request_info) { | 326 std::unique_ptr<net::BidirectionalStreamRequestInfo> request_info) { |
| 326 DCHECK(context_->IsOnNetworkThread()); | 327 DCHECK(context_->IsOnNetworkThread()); |
| 327 DCHECK(!bidi_stream_); | 328 DCHECK(!bidi_stream_); |
| 328 request_info->extra_headers.SetHeaderIfMissing( | 329 request_info->extra_headers.SetHeaderIfMissing( |
| 329 net::HttpRequestHeaders::kUserAgent, context_->GetURLRequestContext() | 330 net::HttpRequestHeaders::kUserAgent, context_->GetURLRequestContext() |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 418 | 419 |
| 419 std::vector<std::string> headers; | 420 std::vector<std::string> headers; |
| 420 for (const auto& header : header_block) { | 421 for (const auto& header : header_block) { |
| 421 headers.push_back(header.first.as_string()); | 422 headers.push_back(header.first.as_string()); |
| 422 headers.push_back(header.second.as_string()); | 423 headers.push_back(header.second.as_string()); |
| 423 } | 424 } |
| 424 return base::android::ToJavaArrayOfStrings(env, headers); | 425 return base::android::ToJavaArrayOfStrings(env, headers); |
| 425 } | 426 } |
| 426 | 427 |
| 427 } // namespace cronet | 428 } // namespace cronet |
| OLD | NEW |