net/test/android/javatests/src/org/chromium/net/test/util/CertTestUtil.java - Issue 2043803003: 👔 Reland #2: Move side-loaded test data /sdcard -> /sdcard/gtestdata

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: net/test/android/javatests/src/org/chromium/net/test/util/CertTestUtil.java

Issue 2043803003: 👔 Reland #2: Move side-loaded test data /sdcard -> /sdcard/gtestdata (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase atop https://codereview.chromium.org/2041723006 Created 4 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« base/test/test_support_android.cc ('K') | « net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServerImpl.java ('k') | net/test/embedded_test_server/android/embedded_test_server_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: net/test/android/javatests/src/org/chromium/net/test/util/CertTestUtil.java

diff --git a/net/test/android/javatests/src/org/chromium/net/test/util/CertTestUtil.java b/net/test/android/javatests/src/org/chromium/net/test/util/CertTestUtil.java

index dc2770e81076c7fe0107836f5e95f57673235cd5..9994da921ffacd16072a8e5556d7a1858afe07a8 100644

--- a/net/test/android/javatests/src/org/chromium/net/test/util/CertTestUtil.java

+++ b/net/test/android/javatests/src/org/chromium/net/test/util/CertTestUtil.java

@@ -6,7 +6,7 @@ package org.chromium.net.test.util;

import android.util.Base64;

-import org.chromium.base.PathUtils;

+import org.chromium.base.test.util.UrlUtils;

import java.io.BufferedReader;

import java.io.FileReader;

@@ -23,7 +23,7 @@ public class CertTestUtil {

* The location of the directory that contains certificates for testing.

public static final String CERTS_DIRECTORY =

- PathUtils.getExternalStorageDirectory() + "/net/data/ssl/certificates/";

+ UrlUtils.getIsolatedTestFilePath("net/data/ssl/certificates/");

private static final String BEGIN_MARKER = "-----BEGIN CERTIFICATE-----";

private static final String END_MARKER = "-----END CERTIFICATE-----";