Update net/android/network_library.cc with fresher code.

net/base/cert_verify_proc_openssl.cc

 // Copyright (c) 2012 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 "net/base/cert_verify_proc_openssl.h"
 
 #include <openssl/x509v3.h>
 
 #include "base/logging.h"
 #include "base/sha1.h"
@@ skipping 141 matching lines @@
     hashes->push_back(hash);
   }
 }
 
 #if defined(OS_ANDROID)
 // Returns true if we have verification result in |verify_result| from Android
 // Trust Manager. Otherwise returns false.
 bool VerifyFromAndroidTrustManager(const std::vector<std::string>& cert_bytes,
                                    CertVerifyResult* verify_result) {
   // TODO(joth): Fetch the authentication type from SSL rather than hardcode.
-  // TODO(jnd): Remove unused |hostname| from net::android::VerifyX509CertChain.
   bool verified = true;
-#if 0
   android::VerifyResult result =
-      android::VerifyX509CertChain(cert_bytes, hostname, "RSA");
-#else
-  // TODO(jingzhao): Recover the original implementation once we support JNI.
-  android::VerifyResult result = android::VERIFY_INVOCATION_ERROR;
-  NOTIMPLEMENTED();
-#endif
+      android::VerifyX509CertChain(cert_bytes, "RSA");
   switch (result) {
     case android::VERIFY_OK:
       break;
-    case android::VERIFY_BAD_HOSTNAME:
-      verify_result->cert_status |= CERT_STATUS_COMMON_NAME_INVALID;
-      break;
     case android::VERIFY_NO_TRUSTED_ROOT:
       verify_result->cert_status |= CERT_STATUS_AUTHORITY_INVALID;
       break;
     case android::VERIFY_INVOCATION_ERROR:
       verified = false;
       break;
     default:
       verify_result->cert_status |= CERT_STATUS_INVALID;
       break;
   }
@@ skipping 91 matching lines @@
   // TODO(joth): if the motivations described in
   // http://src.chromium.org/viewvc/chrome?view=rev&revision=80778 become an
   // issue on OpenSSL builds, we will need to embed a hardcoded list of well
   // known root CAs, as per the _mac and _win versions.
   verify_result->is_issued_by_known_root = true;
 
   return OK;
 }
 
 }  // namespace net