Chromium Code Reviews| 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 <limits> | 7 #include <limits> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 264 DCHECK(context_->IsOnNetworkThread()); | 264 DCHECK(context_->IsOnNetworkThread()); |
| 265 request->Cancel(); | 265 request->Cancel(); |
| 266 int net_error = net::MapCertStatusToNetError(ssl_info.cert_status); | 266 int net_error = net::MapCertStatusToNetError(ssl_info.cert_status); |
| 267 JNIEnv* env = base::android::AttachCurrentThread(); | 267 JNIEnv* env = base::android::AttachCurrentThread(); |
| 268 cronet::Java_CronetUrlRequest_onError( | 268 cronet::Java_CronetUrlRequest_onError( |
| 269 env, owner_.obj(), net_error, | 269 env, owner_.obj(), net_error, |
| 270 ConvertUTF8ToJavaString(env, net::ErrorToString(net_error)).obj(), | 270 ConvertUTF8ToJavaString(env, net::ErrorToString(net_error)).obj(), |
| 271 request->GetTotalReceivedBytes()); | 271 request->GetTotalReceivedBytes()); |
| 272 } | 272 } |
| 273 | 273 |
| 274 void CronetURLRequestAdapter::OnCertificateRequested( | |
|
svaldez
2015/11/20 16:30:10
Move above OnSSLCertificateError to match header o
mef
2015/11/20 16:44:06
Done.
| |
| 275 net::URLRequest* request, | |
| 276 net::SSLCertRequestInfo* cert_request_info) { | |
| 277 DCHECK(context_->IsOnNetworkThread()); | |
| 278 // Cronet does not support client certificates. | |
| 279 request->ContinueWithCertificate(NULL, NULL); | |
| 280 } | |
| 281 | |
| 274 void CronetURLRequestAdapter::OnResponseStarted(net::URLRequest* request) { | 282 void CronetURLRequestAdapter::OnResponseStarted(net::URLRequest* request) { |
| 275 DCHECK(context_->IsOnNetworkThread()); | 283 DCHECK(context_->IsOnNetworkThread()); |
| 276 if (MaybeReportError(request)) | 284 if (MaybeReportError(request)) |
| 277 return; | 285 return; |
| 278 JNIEnv* env = base::android::AttachCurrentThread(); | 286 JNIEnv* env = base::android::AttachCurrentThread(); |
| 279 cronet::Java_CronetUrlRequest_onResponseStarted( | 287 cronet::Java_CronetUrlRequest_onResponseStarted( |
| 280 env, owner_.obj(), request->GetResponseCode(), | 288 env, owner_.obj(), request->GetResponseCode(), |
| 281 GetResponseHeaders(env).obj()); | 289 GetResponseHeaders(env).obj()); |
| 282 } | 290 } |
| 283 | 291 |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 388 << " on chromium request: " << initial_url_.possibly_invalid_spec(); | 396 << " on chromium request: " << initial_url_.possibly_invalid_spec(); |
| 389 JNIEnv* env = base::android::AttachCurrentThread(); | 397 JNIEnv* env = base::android::AttachCurrentThread(); |
| 390 cronet::Java_CronetUrlRequest_onError( | 398 cronet::Java_CronetUrlRequest_onError( |
| 391 env, owner_.obj(), net_error, | 399 env, owner_.obj(), net_error, |
| 392 ConvertUTF8ToJavaString(env, net::ErrorToString(net_error)).obj(), | 400 ConvertUTF8ToJavaString(env, net::ErrorToString(net_error)).obj(), |
| 393 request->GetTotalReceivedBytes()); | 401 request->GetTotalReceivedBytes()); |
| 394 return true; | 402 return true; |
| 395 } | 403 } |
| 396 | 404 |
| 397 } // namespace cronet | 405 } // namespace cronet |
| OLD | NEW |