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

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/ChromeBackgroundServiceTest.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/ChromeBackgroundServiceTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/ChromeBackgroundServiceTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/ChromeBackgroundServiceTest.java
index 1e4c25f682e6137c0c0b71a1ba83ca2d84ac2715..244f60a1e5acaac15bc2267d276689149beab1ac 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/ChromeBackgroundServiceTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/ChromeBackgroundServiceTest.java
@@ -5,6 +5,7 @@
package org.chromium.chrome.browser;
import android.content.Context;
+import android.support.test.InstrumentationRegistry;
import android.support.test.filters.SmallTest;
import com.google.android.gms.gcm.TaskParams;
@@ -18,6 +19,7 @@
import org.chromium.base.ContextUtils;
import org.chromium.base.ThreadUtils;
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.browser.ntp.snippets.SnippetsLauncher;
@@ -30,6 +32,7 @@
@RunWith(ChromeJUnit4ClassRunner.class)
@RetryOnFailure
public class ChromeBackgroundServiceTest {
+ private Context mContext;
private BackgroundSyncLauncher mSyncLauncher;
private SnippetsLauncher mSnippetsLauncher;
private MockTaskService mTaskService;
@@ -104,10 +107,12 @@
@Before
public void setUp() throws Exception {
+ mContext = new AdvancedMockContext(
+ InstrumentationRegistry.getInstrumentation().getTargetContext());
BackgroundSyncLauncher.setGCMEnabled(false);
RecordHistogram.setDisabledForTests(true);
- mSyncLauncher = BackgroundSyncLauncher.create();
- mSnippetsLauncher = SnippetsLauncher.create();
+ mSyncLauncher = BackgroundSyncLauncher.create(mContext);
+ mSnippetsLauncher = SnippetsLauncher.create(mContext);
mTaskService = new MockTaskService();
}

Powered by Google App Engine
This is Rietveld 408576698