android_webview/javatests/src/org/chromium/android_webview/test/HttpCacheTest.java - Issue 2333713003: Move PathUtils to use ContextUtils.

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: android_webview/javatests/src/org/chromium/android_webview/test/HttpCacheTest.java

Issue 2333713003: Move PathUtils to use ContextUtils. (Closed)

Patch Set: Rebase Created 4 years, 2 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

« no previous file with comments | « android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java ('k') | base/android/java/src/org/chromium/base/BaseChromiumApplication.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: android_webview/javatests/src/org/chromium/android_webview/test/HttpCacheTest.java

diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/HttpCacheTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/HttpCacheTest.java

index c51ff40cb53390a085bad1f4632bbea6da77b83c..dd513184e159bd36c80e78aff2e734c03f7fedd4 100644

--- a/android_webview/javatests/src/org/chromium/android_webview/test/HttpCacheTest.java

+++ b/android_webview/javatests/src/org/chromium/android_webview/test/HttpCacheTest.java

@@ -4,7 +4,6 @@

package org.chromium.android_webview.test;

-import android.content.Context;

import android.test.suitebuilder.annotation.SmallTest;

import org.chromium.android_webview.AwBrowserProcess;

@@ -70,9 +69,9 @@ public class HttpCacheTest extends AwTestBase {

@SmallTest

@Feature({"AndroidWebView"})

public void testLegacyHttpCacheDirIsRemovedOnStartup() throws Exception {

- Context appContext = getInstrumentation().getTargetContext().getApplicationContext();

- PathUtils.setPrivateDataDirectorySuffix(

- AwBrowserProcess.PRIVATE_DATA_DIRECTORY_SUFFIX, appContext);

+ ContextUtils.initApplicationContext(

+ getInstrumentation().getTargetContext().getApplicationContext());

+ PathUtils.setPrivateDataDirectorySuffix(AwBrowserProcess.PRIVATE_DATA_DIRECTORY_SUFFIX);

File webViewLegacyCacheDir = new File(PathUtils.getDataDirectory(), "Cache");

if (!webViewLegacyCacheDir.isDirectory()) {

assertTrue(webViewLegacyCacheDir.mkdir());

@@ -82,7 +81,6 @@ public class HttpCacheTest extends AwTestBase {

assertTrue(dummyCacheFile.exists());

// Set up JNI bindings.

- ContextUtils.initApplicationContext(appContext);

AwBrowserProcess.loadLibrary();

// No delay before removing the legacy cache files.

AwContentsStatics.setLegacyCacheRemovalDelayForTest(0);