X509NameAttribute::ValueAsString: Decode TeletexString as Latin1.

net/test/test_data_directory.cc

Index: net/test/test_data_directory.cc
diff --git a/net/test/test_data_directory.cc b/net/test/test_data_directory.cc
index b35392407bb2724cdc95d01aedbfa9b71930be6b..f751751c5db6079df0840fa9d6dc40c9471ba2fb 100644
--- a/net/test/test_data_directory.cc
+++ b/net/test/test_data_directory.cc
@@ -11,23 +11,34 @@
 namespace net {
 
 namespace {
-const base::FilePath::CharType kCertificateRelativePath[] =
-    FILE_PATH_LITERAL("net/data/ssl/certificates");
+
+// Net data directory, relative to source root.
+const base::FilePath::CharType kNetDataRelativePath[] =
+    FILE_PATH_LITERAL("net/data");
+
+// Test certificates directory, relative to kNetDataRelativePath.
+const base::FilePath::CharType kCertificateDataSubPath[] =
+    FILE_PATH_LITERAL("ssl/certificates");
+
 }  // namespace
 
-base::FilePath GetTestCertsDirectory() {
+base::FilePath GetTestNetDataDirectory() {
   base::FilePath src_root;
   {
     base::ThreadRestrictions::ScopedAllowIO allow_io_for_path_service;
     PathService::Get(base::DIR_SOURCE_ROOT, &src_root);
   }
 
-  return src_root.Append(kCertificateRelativePath);
+  return src_root.Append(kNetDataRelativePath);
+}
+
+base::FilePath GetTestCertsDirectory() {
+  return GetTestNetDataDirectory().Append(kCertificateDataSubPath);
 }
 
 base::FilePath GetTestClientCertsDirectory() {
 #if defined(OS_ANDROID)
-  return base::FilePath(kCertificateRelativePath);
+  return base::FilePath(kNetDataRelativePath).Append(kCertificateDataSubPath);
 #else
   return GetTestCertsDirectory();
 #endif