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

Side by Side Diff: components/cronet/android/cronet_bidirectional_stream_adapter.cc

Issue 1393713005: [Cronet] Add error code and immediatelyRetryable() to UrlRequestException (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix missing test annotation Created 4 years, 10 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
OLDNEW
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"
11 #include "base/location.h" 11 #include "base/location.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/strings/string_number_conversions.h" 13 #include "base/strings/string_number_conversions.h"
14 #include "components/cronet/android/cronet_url_request_context_adapter.h" 14 #include "components/cronet/android/cronet_url_request_context_adapter.h"
15 #include "components/cronet/android/url_request_error.h"
15 #include "jni/CronetBidirectionalStream_jni.h" 16 #include "jni/CronetBidirectionalStream_jni.h"
16 #include "net/base/io_buffer.h" 17 #include "net/base/io_buffer.h"
17 #include "net/base/net_errors.h" 18 #include "net/base/net_errors.h"
18 #include "net/base/request_priority.h" 19 #include "net/base/request_priority.h"
19 #include "net/http/bidirectional_stream_request_info.h" 20 #include "net/http/bidirectional_stream_request_info.h"
20 #include "net/http/http_network_session.h" 21 #include "net/http/http_network_session.h"
21 #include "net/http/http_response_headers.h" 22 #include "net/http/http_response_headers.h"
22 #include "net/http/http_status_code.h" 23 #include "net/http/http_status_code.h"
23 #include "net/http/http_transaction_factory.h" 24 #include "net/http/http_transaction_factory.h"
24 #include "net/http/http_util.h" 25 #include "net/http/http_util.h"
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 DCHECK(context_->IsOnNetworkThread()); 267 DCHECK(context_->IsOnNetworkThread());
267 JNIEnv* env = base::android::AttachCurrentThread(); 268 JNIEnv* env = base::android::AttachCurrentThread();
268 cronet::Java_CronetBidirectionalStream_onResponseTrailersReceived( 269 cronet::Java_CronetBidirectionalStream_onResponseTrailersReceived(
269 env, owner_.obj(), GetHeadersArray(env, response_trailers).obj()); 270 env, owner_.obj(), GetHeadersArray(env, response_trailers).obj());
270 } 271 }
271 272
272 void CronetBidirectionalStreamAdapter::OnFailed(int error) { 273 void CronetBidirectionalStreamAdapter::OnFailed(int error) {
273 DCHECK(context_->IsOnNetworkThread()); 274 DCHECK(context_->IsOnNetworkThread());
274 JNIEnv* env = base::android::AttachCurrentThread(); 275 JNIEnv* env = base::android::AttachCurrentThread();
275 cronet::Java_CronetBidirectionalStream_onError( 276 cronet::Java_CronetBidirectionalStream_onError(
276 env, owner_.obj(), error, 277 env, owner_.obj(), NetErrorToUrlRequestError(error), error,
277 ConvertUTF8ToJavaString(env, net::ErrorToString(error)).obj(), 278 ConvertUTF8ToJavaString(env, net::ErrorToString(error)).obj(),
278 bidi_stream_->GetTotalReceivedBytes()); 279 bidi_stream_->GetTotalReceivedBytes());
279 } 280 }
280 281
281 void CronetBidirectionalStreamAdapter::StartOnNetworkThread( 282 void CronetBidirectionalStreamAdapter::StartOnNetworkThread(
282 scoped_ptr<net::BidirectionalStreamRequestInfo> request_info) { 283 scoped_ptr<net::BidirectionalStreamRequestInfo> request_info) {
283 DCHECK(context_->IsOnNetworkThread()); 284 DCHECK(context_->IsOnNetworkThread());
284 DCHECK(!bidi_stream_); 285 DCHECK(!bidi_stream_);
285 bidi_stream_.reset(new net::BidirectionalStream( 286 bidi_stream_.reset(new net::BidirectionalStream(
286 std::move(request_info), context_->GetURLRequestContext() 287 std::move(request_info), context_->GetURLRequestContext()
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
340 341
341 std::vector<std::string> headers; 342 std::vector<std::string> headers;
342 for (const auto& header : header_block) { 343 for (const auto& header : header_block) {
343 headers.push_back(header.first.as_string()); 344 headers.push_back(header.first.as_string());
344 headers.push_back(header.second.as_string()); 345 headers.push_back(header.second.as_string());
345 } 346 }
346 return base::android::ToJavaArrayOfStrings(env, headers); 347 return base::android::ToJavaArrayOfStrings(env, headers);
347 } 348 }
348 349
349 } // namespace cronet 350 } // namespace cronet
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698