android_webview/unittestjava/src/org/chromium/android_webview/unittest/MockAwContentsClientBridge.java - Issue 1474603004: Remove Android support for out-of-process KeyStores

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/unittestjava/src/org/chromium/android_webview/unittest/MockAwContentsClientBridge.java

Issue 1474603004: Remove Android support for out-of-process KeyStores (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: updated comments Created 5 years 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/native/aw_contents_client_bridge_unittest.cc ('k') | chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: android_webview/unittestjava/src/org/chromium/android_webview/unittest/MockAwContentsClientBridge.java

diff --git a/android_webview/unittestjava/src/org/chromium/android_webview/unittest/MockAwContentsClientBridge.java b/android_webview/unittestjava/src/org/chromium/android_webview/unittest/MockAwContentsClientBridge.java

index 0be58248fd61d5017dcf96ddd7c430b5616afd87..6a03520d1bd4c36ce273107414bbb4e3cf6cf3d3 100644

--- a/android_webview/unittestjava/src/org/chromium/android_webview/unittest/MockAwContentsClientBridge.java

+++ b/android_webview/unittestjava/src/org/chromium/android_webview/unittest/MockAwContentsClientBridge.java

@@ -7,9 +7,6 @@ package org.chromium.android_webview.unittest;

import org.chromium.android_webview.AwContentsClientBridge;

import org.chromium.android_webview.ClientCertLookupTable;

import org.chromium.base.annotations.CalledByNative;

-import org.chromium.net.AndroidKeyStore;

-import org.chromium.net.AndroidPrivateKey;

-import org.chromium.net.DefaultAndroidKeyStore;

class MockAwContentsClientBridge extends AwContentsClientBridge {

@@ -17,7 +14,7 @@ class MockAwContentsClientBridge extends AwContentsClientBridge {

private String[] mKeyTypes;

public MockAwContentsClientBridge() {

- super(new DefaultAndroidKeyStore(), new ClientCertLookupTable());

+ super(new ClientCertLookupTable());

}

@Override

@@ -43,16 +40,6 @@ class MockAwContentsClientBridge extends AwContentsClientBridge {

}

@CalledByNative

- private AndroidPrivateKey createTestPrivateKey() {

- return new AndroidPrivateKey() {

- @Override

- public AndroidKeyStore getKeyStore() {

- return null;

- }

- };

- }

- @CalledByNative

private byte[][] createTestCertChain() {

return new byte[][]{{1}};

}