chrome/android/junit/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridgeTest.java - Issue 2243353002: (Reland) Update all Robolectric tests to Robolectric 3.0

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: chrome/android/junit/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridgeTest.java

Issue 2243353002: (Reland) Update all Robolectric tests to Robolectric 3.0 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 4 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 | « chrome/android/junit/src/org/chromium/chrome/browser/offlinepages/ClientIdTest.java ('k') | chrome/android/junit/src/org/chromium/chrome/browser/offlinepages/OfflinePageTabObserverTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/junit/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridgeTest.java

diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridgeTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridgeTest.java

index 6a20b1f1f328357edcafba23526edd316e73bcbe..99c3016e957fe6bae5ba0166e6c7d77459f79473 100644

--- a/chrome/android/junit/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridgeTest.java

+++ b/chrome/android/junit/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridgeTest.java

@@ -20,7 +20,6 @@ import static org.mockito.Mockito.verify;

import org.chromium.base.BaseChromiumApplication;

import org.chromium.base.Callback;

import org.chromium.base.ThreadUtils;

-import org.chromium.base.test.shadows.ShadowMultiDex;

import org.chromium.base.test.util.Feature;

import org.chromium.chrome.browser.offlinepages.OfflinePageBridge.OfflinePageModelObserver;

import org.chromium.testing.local.LocalRobolectricTestRunner;

@@ -33,6 +32,7 @@ import org.mockito.MockitoAnnotations;

import org.mockito.invocation.InvocationOnMock;

import org.mockito.stubbing.Answer;

import org.robolectric.annotation.Config;

+import org.robolectric.shadows.multidex.ShadowMultiDex;

import java.util.List;

import java.util.Set;