chrome/android/junit/src/org/chromium/chrome/browser/offlinepages/OfflinePageUtilsTest.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/OfflinePageUtilsTest.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/OfflinePageTestRunner.java ('k') | chrome/android/junit/src/org/chromium/chrome/browser/offlinepages/ShadowGcmNetworkManager.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/OfflinePageUtilsTest.java

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

index f89ab8c7fa824ea668929657769e2d3bac715616..4ae2f9a94c9e61e4d21d290fdda8ea27d3a39821 100644

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

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

@@ -16,7 +16,6 @@ import static org.mockito.Mockito.when;

import android.os.Environment;

import org.chromium.base.BaseChromiumApplication;

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

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

import org.chromium.chrome.browser.profiles.Profile;

import org.chromium.chrome.browser.tab.Tab;

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

import org.robolectric.annotation.Config;

import org.robolectric.annotation.Implementation;

import org.robolectric.annotation.Implements;

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

import java.io.File;