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

Unified Diff: chrome/android/junit/src/org/chromium/chrome/browser/media/router/ChromeMediaRouterSinkObservationTest.java

Issue 2239003002: Revert of [Android] 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/ChromeMediaRouterSinkObservationTest.java
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/media/router/ChromeMediaRouterSinkObservationTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/media/router/ChromeMediaRouterSinkObservationTest.java
index 981aed4278df4caed2fd8a82196094fa6ee4ae23..4c85f8ef7bd3ee5baf0744346c329edcc01f3ddc 100644
--- a/chrome/android/junit/src/org/chromium/chrome/browser/media/router/ChromeMediaRouterSinkObservationTest.java
+++ b/chrome/android/junit/src/org/chromium/chrome/browser/media/router/ChromeMediaRouterSinkObservationTest.java
@@ -9,9 +9,6 @@
import android.os.Build;
-import org.chromium.base.BaseSwitches;
-import org.chromium.base.CommandLine;
-import org.chromium.base.SysUtils;
import org.chromium.base.test.util.Feature;
import org.chromium.chrome.browser.media.router.cast.MediaSink;
import org.chromium.testing.local.LocalRobolectricTestRunner;
@@ -26,7 +23,8 @@
* Sink observation tests for ChromeMediaRouter.
*/
@RunWith(LocalRobolectricTestRunner.class)
-@Config(manifest = Config.NONE)
+@Config(manifest = Config.NONE,
+ shadows = { ChromeMediaRouterTestBase.FakeActivityManager.class })
public class ChromeMediaRouterSinkObservationTest extends ChromeMediaRouterTestBase {
@Test
@Feature({"MediaRouter"})
@@ -94,19 +92,15 @@
@Test
@Feature({"MediaRouter"})
- public void testNotLowRamDevice() throws Exception {
- SysUtils.reset();
- CommandLine.getInstance().appendSwitch(
- BaseSwitches.DISABLE_LOW_END_DEVICE_MODE);
+ public void testNotLowRamDevice() {
+ sIsLowRamDevice = false;
assertTrue(mChromeMediaRouter.startObservingMediaSinks(SOURCE_ID1));
}
@Test
@Feature({"MediaRouter"})
- public void testIsLowRamDevice() throws Exception {
- SysUtils.reset();
- CommandLine.getInstance().appendSwitch(
- BaseSwitches.ENABLE_LOW_END_DEVICE_MODE);
+ public void testIsLowRamDevice() {
+ sIsLowRamDevice = true;
assertEquals(Build.VERSION.SDK_INT <= Build.VERSION_CODES.JELLY_BEAN_MR2,
mChromeMediaRouter.startObservingMediaSinks(SOURCE_ID1));
}

Powered by Google App Engine
This is Rietveld 408576698