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

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/BackgroundSyncLauncherTest.java

Issue 2800833003: Revert of Android: Remove GetApplicationContext part 2 (Closed)
Patch Set: Created 3 years, 8 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/javatests/src/org/chromium/chrome/browser/BackgroundSyncLauncherTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/BackgroundSyncLauncherTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/BackgroundSyncLauncherTest.java
index 37b9567f9c9b1e2c386eaebc2fba93adebc7261d..9284e49bfc3347bbe7098c07d648b10071482bd5 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/BackgroundSyncLauncherTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/BackgroundSyncLauncherTest.java
@@ -4,6 +4,8 @@
package org.chromium.chrome.browser;
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
import android.support.test.filters.SmallTest;
import org.junit.After;
@@ -13,6 +15,7 @@
import org.junit.runner.RunWith;
import org.chromium.base.metrics.RecordHistogram;
+import org.chromium.base.test.util.AdvancedMockContext;
import org.chromium.base.test.util.Feature;
import org.chromium.base.test.util.RetryOnFailure;
import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
@@ -25,14 +28,17 @@
*/
@RunWith(ChromeJUnit4ClassRunner.class)
public class BackgroundSyncLauncherTest {
+ private Context mContext;
private BackgroundSyncLauncher mLauncher;
private Boolean mShouldLaunchResult;
@Before
public void setUp() throws Exception {
+ mContext = new AdvancedMockContext(
+ InstrumentationRegistry.getInstrumentation().getTargetContext());
BackgroundSyncLauncher.setGCMEnabled(false);
RecordHistogram.setDisabledForTests(true);
- mLauncher = BackgroundSyncLauncher.create();
+ mLauncher = BackgroundSyncLauncher.create(mContext);
// Ensure that the initial task is given enough time to complete.
waitForLaunchBrowserTask();
}
@@ -124,7 +130,7 @@
// Simulate restarting the browser by deleting the launcher and creating a new one.
deleteLauncherInstance();
- mLauncher = BackgroundSyncLauncher.create();
+ mLauncher = BackgroundSyncLauncher.create(mContext);
waitForLaunchBrowserTask();
Assert.assertFalse(shouldLaunchBrowserIfStoppedSync());
}

Powered by Google App Engine
This is Rietveld 408576698