Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1380)

Unified Diff: chrome/android/junit/src/org/chromium/chrome/browser/media/router/ChromeMediaRouterTestBase.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
Index: chrome/android/junit/src/org/chromium/chrome/browser/media/router/ChromeMediaRouterTestBase.java
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/media/router/ChromeMediaRouterTestBase.java b/chrome/android/junit/src/org/chromium/chrome/browser/media/router/ChromeMediaRouterTestBase.java
index 51487e69c76865f7634f019a7fbd146ff990926d..3c0ac3c3e3d8c10bb4bafde29887d89f5113de53 100644
--- a/chrome/android/junit/src/org/chromium/chrome/browser/media/router/ChromeMediaRouterTestBase.java
+++ b/chrome/android/junit/src/org/chromium/chrome/browser/media/router/ChromeMediaRouterTestBase.java
@@ -11,13 +11,8 @@ import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
-import android.app.ActivityManager;
-
import org.chromium.base.CommandLine;
import org.junit.Before;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-import org.robolectric.shadows.ShadowActivityManager;
import org.robolectric.shadows.ShadowLog;
/**
@@ -56,26 +51,12 @@ public class ChromeMediaRouterTestBase {
protected static final int TAB_ID2 = 2;
protected static final int REQUEST_ID1 = 1;
protected static final int REQUEST_ID2 = 2;
- protected static boolean sIsLowRamDevice;
protected ChromeMediaRouter mChromeMediaRouter;
protected MediaRouteProvider mRouteProvider;
- /**
- * Robolectric's ShadowActivityManager implementation in order to extend
- * isLowRamDevice and be able to instrument the tests.
- */
- @Implements(ActivityManager.class)
- public static class FakeActivityManager extends ShadowActivityManager {
- @Implementation
- public boolean isLowRamDevice() {
- return sIsLowRamDevice;
- }
- }
-
@Before
public void setUp() {
ShadowLog.stream = System.out;
- sIsLowRamDevice = false;
mChromeMediaRouter = spy(new ChromeMediaRouter(0));
mRouteProvider = mock(MediaRouteProvider.class);
doReturn(true).when(mRouteProvider).supportsSource(anyString());

Powered by Google App Engine
This is Rietveld 408576698