Revert of Enable public key pinning of local trust anchors

components/cronet/android/test/mock_cert_verifier.cc

 // Copyright 2015 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 "mock_cert_verifier.h"
 
 #include <string>
 #include <vector>
 
 #include "base/android/jni_android.h"
@@ skipping 37 matching lines @@
                            crypto::kSHA256Length);
   return true;
 }
 
 }  // namespace
 
 static jlong CreateMockCertVerifier(
     JNIEnv* env,
     const JavaParamRef<jclass>& jcaller,
     const JavaParamRef<jobjectArray>& jcerts,
-    const jboolean jknown_root,
     const JavaParamRef<jstring>& jtest_data_dir) {
   base::FilePath test_data_dir(
       base::android::ConvertJavaStringToUTF8(env, jtest_data_dir));
   base::InitAndroidTestPaths(test_data_dir);
 
   std::vector<std::string> certs;
   base::android::AppendJavaStringArrayToStringVector(env, jcerts, &certs);
   net::MockCertVerifier* mock_cert_verifier = new net::MockCertVerifier();
-  for (const auto& cert : certs) {
+  for (auto cert : certs) {
     net::CertVerifyResult verify_result;
     verify_result.verified_cert =
         net::ImportCertFromFile(net::GetTestCertsDirectory(), cert);
 
-    // By default, HPKP verification is enabled for known trust roots only.
-    verify_result.is_issued_by_known_root = jknown_root;
+    // Let the cert be treated as a known root cert.
+    // This will enable HPKP verification.
+    verify_result.is_issued_by_known_root = true;
 
     // Calculate the public key hash and add it to the verify_result.
     net::HashValue hashValue;
     CHECK(CalculatePublicKeySha256(*verify_result.verified_cert.get(),
                                    &hashValue));
     verify_result.public_key_hashes.push_back(hashValue);
 
     mock_cert_verifier->AddResultForCert(verify_result.verified_cert.get(),
                                          verify_result, net::OK);
   }
 
   return reinterpret_cast<jlong>(mock_cert_verifier);
 }
 
 bool RegisterMockCertVerifier(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace cronet