[Cronet] Add error code and immediatelyRetryable() to UrlRequestException

components/cronet/android/cronet_url_request_adapter.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cronet_url_request_adapter.h"
 
 #include <limits>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 10 matching lines @@
 #include "net/http/http_status_code.h"
 #include "net/http/http_util.h"
 #include "net/ssl/ssl_info.h"
 #include "net/url_request/redirect_info.h"
 #include "net/url_request/url_request_context.h"
 
 using base::android::ConvertUTF8ToJavaString;
 
 namespace cronet {
 
+namespace {
+
+// Error codes for the most popular network stack error codes.
+// For descriptions see corresponding constants in UrlRequestException.java.
+// A Java counterpart will be generated for this enum.
+// GENERATED_JAVA_ENUM_PACKAGE: org.chromium.net
+enum UrlRequestError {
+  LISTENER_THREW,
+  HOSTNAME_NOT_RESOLVED,
+  INTERNET_DISCONNECTED,
+  NETWORK_CHANGED,
+  TIMED_OUT,
+  CONNECTION_CLOSED,
+  CONNECTION_TIMED_OUT,
+  CONNECTION_REFUSED,
+  CONNECTION_RESET,
+  ADDRESS_UNREACHABLE,
+  OTHER,
+};
+
+// Convert most popular net::ERR_* values to counterparts accessible in Java.

[xunjieli, 2015/11/06 15:23:22]

nit: Convert -> Converts

[pauljensen, 2016/01/25 01:43:51]

Done.

+UrlRequestError NetErrorToUrlRequestError(int net_error) {
+  switch (net_error) {
+    case net::ERR_NAME_NOT_RESOLVED:
+      return HOSTNAME_NOT_RESOLVED;
+    case net::ERR_INTERNET_DISCONNECTED:
+      return INTERNET_DISCONNECTED;
+    case net::ERR_NETWORK_CHANGED:
+      return NETWORK_CHANGED;
+    case net::ERR_TIMED_OUT:
+      return TIMED_OUT;
+    case net::ERR_CONNECTION_CLOSED:
+      return CONNECTION_CLOSED;
+    case net::ERR_CONNECTION_TIMED_OUT:
+      return CONNECTION_TIMED_OUT;
+    case net::ERR_CONNECTION_REFUSED:
+      return CONNECTION_REFUSED;
+    case net::ERR_CONNECTION_RESET:
+      return CONNECTION_RESET;
+    case net::ERR_ADDRESS_UNREACHABLE:
+      return ADDRESS_UNREACHABLE;
+    default:
+      return OTHER;
+  }
+}
+}
+
 // Explicitly register static JNI functions.
 bool CronetUrlRequestAdapterRegisterJni(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 static jlong CreateRequestAdapter(JNIEnv* env,
                                   const JavaParamRef<jobject>& jurl_request,
                                   jlong jurl_request_context_adapter,
                                   const JavaParamRef<jstring>& jurl_string,
                                   jint jpriority) {
@@ skipping 218 matching lines @@
 
 void CronetURLRequestAdapter::OnSSLCertificateError(
     net::URLRequest* request,
     const net::SSLInfo& ssl_info,
     bool fatal) {
   DCHECK(context_->IsOnNetworkThread());
   request->Cancel();
   int net_error = net::MapCertStatusToNetError(ssl_info.cert_status);
   JNIEnv* env = base::android::AttachCurrentThread();
   cronet::Java_CronetUrlRequest_onError(
-      env, owner_.obj(), net_error,
+      env, owner_.obj(), NetErrorToUrlRequestError(net_error), net_error,
       ConvertUTF8ToJavaString(env, net::ErrorToString(net_error)).obj(),
       request->GetTotalReceivedBytes());
 }
 
 void CronetURLRequestAdapter::OnResponseStarted(net::URLRequest* request) {
   DCHECK(context_->IsOnNetworkThread());
   if (MaybeReportError(request))
     return;
   JNIEnv* env = base::android::AttachCurrentThread();
   cronet::Java_CronetUrlRequest_onResponseStarted(
@@ skipping 101 matching lines @@
 bool CronetURLRequestAdapter::MaybeReportError(net::URLRequest* request) const {
   DCHECK_NE(net::URLRequestStatus::IO_PENDING, url_request_->status().status());
   DCHECK_EQ(request, url_request_);
   if (url_request_->status().is_success())
     return false;
   int net_error = url_request_->status().error();
   VLOG(1) << "Error " << net::ErrorToString(net_error)
           << " on chromium request: " << initial_url_.possibly_invalid_spec();
   JNIEnv* env = base::android::AttachCurrentThread();
   cronet::Java_CronetUrlRequest_onError(
-      env, owner_.obj(), net_error,
+      env, owner_.obj(), NetErrorToUrlRequestError(net_error), net_error,
       ConvertUTF8ToJavaString(env, net::ErrorToString(net_error)).obj(),
       request->GetTotalReceivedBytes());
   return true;
 }
 
 }  // namespace cronet