👔 Reland #2: Move side-loaded test data /sdcard -> /sdcard/gtestdata

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"
 #include "base/android/jni_array.h"
+#include "base/android/jni_string.h"
+#include "base/test/test_support_android.h"
 #include "crypto/sha2.h"
 #include "jni/MockCertVerifier_jni.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_data_directory.h"
 #include "net/cert/asn1_util.h"
 #include "net/cert/cert_verifier.h"
 #include "net/cert/cert_verify_result.h"
 #include "net/cert/mock_cert_verifier.h"
 #include "net/test/cert_test_util.h"
 
@@ skipping 20 matching lines @@
   }
   // Calculate SHA256 hash of public key bytes.
   out_hash_value->tag = net::HASH_VALUE_SHA256;
   crypto::SHA256HashString(spki_bytes, out_hash_value->data(),
                            crypto::kSHA256Length);
   return true;
 }
 
 }  // namespace
 
-static jlong CreateMockCertVerifier(JNIEnv* env,
-                                    const JavaParamRef<jclass>& jcaller,
-                                    const JavaParamRef<jobjectArray>& jcerts) {
+static jlong CreateMockCertVerifier(
+    JNIEnv* env,
+    const JavaParamRef<jclass>& jcaller,
+    const JavaParamRef<jobjectArray>& jcerts,
+    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 (auto cert : certs) {
     net::CertVerifyResult verify_result;
     verify_result.verified_cert =
         net::ImportCertFromFile(net::GetTestCertsDirectory(), cert);
 
     // Let the cert be treated as a known root cert.
     // This will enable HPKP verification.
@@ skipping 10 matching lines @@
   }
 
   return reinterpret_cast<jlong>(mock_cert_verifier);
 }
 
 bool RegisterMockCertVerifier(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace cronet