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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2801033002: 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
« no previous file with comments | « chrome/android/javatests/src/org/chromium/chrome/browser/crash/LogcatExtractionRunnableTest.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/history/HistoryActivityTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/javatests/src/org/chromium/chrome/browser/crash/MinidumpUploadServiceTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/crash/MinidumpUploadServiceTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/crash/MinidumpUploadServiceTest.java
index 3d6d876d60550c891458b4d7a78d42f65a69d8cd..3b448e7b96959ec61bd69b4bfc724614fb5be3c7 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/crash/MinidumpUploadServiceTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/crash/MinidumpUploadServiceTest.java
@@ -3,8 +3,6 @@
// found in the LICENSE file.
package org.chromium.chrome.browser.crash;
-
-import static android.support.test.InstrumentationRegistry.getInstrumentation;
import static org.chromium.chrome.browser.crash.MinidumpUploadService.BROWSER;
import static org.chromium.chrome.browser.crash.MinidumpUploadService.GPU;
@@ -22,7 +20,6 @@
import android.os.HandlerThread;
import android.support.test.filters.SmallTest;
-import org.chromium.base.ContextUtils;
import org.chromium.base.annotations.SuppressFBWarnings;
import org.chromium.base.test.util.AdvancedMockContext;
import org.chromium.base.test.util.Feature;
@@ -93,7 +90,7 @@
new File(mCrashDir, "chromium_renderer-333.dmp3"),
};
MinidumpPreparationContext context = new MinidumpPreparationContext(
- getInstrumentation().getTargetContext().getApplicationContext()) {
+ getInstrumentation().getTargetContext()) {
@Override
public ComponentName startService(Intent intentToCheck) {
String filePath =
@@ -116,8 +113,7 @@
// Run test.
service.onCreate();
- ContextUtils.initApplicationContextForTests(context);
- MinidumpUploadService.tryUploadAllCrashDumps();
+ MinidumpUploadService.tryUploadAllCrashDumps(context);
// Verify.
for (File minidumpFile : minidumpFiles) {
@@ -244,7 +240,7 @@
// calls on a handler thread. We pass in the MinidumpUploadService as an argument so we
// can call it directly without going through the Android framework.
final MinidumpPreparationContext context = new MinidumpPreparationContext(
- getInstrumentation().getTargetContext().getApplicationContext(), service) {
+ getInstrumentation().getTargetContext(), service) {
Handler mHandler;
{
HandlerThread handlerThread =
@@ -277,8 +273,7 @@
// Run test.
service.onCreate();
- ContextUtils.initApplicationContextForTests(context);
- MinidumpUploadService.tryUploadCrashDump(minidumpFile);
+ MinidumpUploadService.tryUploadCrashDump(context, minidumpFile);
// Verify asynchronously.
CriteriaHelper.pollInstrumentationThread(
@@ -311,7 +306,7 @@
setUpMinidumpFile(minidumpFile, BOUNDARY);
final String startServiceFlag = "startServiceFlag";
MinidumpPreparationContext context = new MinidumpPreparationContext(
- getInstrumentation().getTargetContext().getApplicationContext()) {
+ getInstrumentation().getTargetContext()) {
@Override
public ComponentName startService(Intent intentToCheck) {
assertEquals(MinidumpUploadService.ACTION_UPLOAD, intentToCheck.getAction());
@@ -325,8 +320,7 @@
};
// Run test.
- ContextUtils.initApplicationContextForTests(context);
- MinidumpUploadService.tryUploadCrashDumpWithLocalId("f297dbcba7a2d0bb");
+ MinidumpUploadService.tryUploadCrashDumpWithLocalId(context, "f297dbcba7a2d0bb");
// Verify.
assertTrue("Should have called startService(...)", context.isFlagSet(startServiceFlag));
@@ -343,12 +337,11 @@
setUpMinidumpFile(
new File(mCrashDir, "chromium-renderer-minidump-f297dbcba7a2d0bb.dmp0.try3"),
BOUNDARY);
- AdvancedMockContext context = new MinidumpPreparationContext(
- getInstrumentation().getTargetContext().getApplicationContext());
-
- // Run test.
- ContextUtils.initApplicationContextForTests(context);
- MinidumpUploadService.tryUploadCrashDumpWithLocalId("f297dbcba7a2d0bb");
+ AdvancedMockContext context =
+ new MinidumpPreparationContext(getInstrumentation().getTargetContext());
+
+ // Run test.
+ MinidumpUploadService.tryUploadCrashDumpWithLocalId(context, "f297dbcba7a2d0bb");
// Verify.
final File expectedRenamedMinidumpFile =
@@ -374,7 +367,7 @@
setUpMinidumpFile(minidumpFile, BOUNDARY);
final String startServiceFlag = "startServiceFlag";
MinidumpPreparationContext context = new MinidumpPreparationContext(
- getInstrumentation().getTargetContext().getApplicationContext()) {
+ getInstrumentation().getTargetContext()) {
@Override
public ComponentName startService(Intent intentToCheck) {
assertEquals(MinidumpUploadService.ACTION_UPLOAD, intentToCheck.getAction());
@@ -388,8 +381,7 @@
};
// Run test.
- ContextUtils.initApplicationContextForTests(context);
- MinidumpUploadService.tryUploadCrashDumpWithLocalId("f297dbcba7a2d0bb");
+ MinidumpUploadService.tryUploadCrashDumpWithLocalId(context, "f297dbcba7a2d0bb");
// Verify.
assertTrue("Should have called startService(...)", context.isFlagSet(startServiceFlag));
@@ -406,12 +398,11 @@
setUpMinidumpFile(
new File(mCrashDir, "chromium-renderer-minidump-f297dbcba7a2d0bb.skipped0.try3"),
BOUNDARY);
- AdvancedMockContext context = new MinidumpPreparationContext(
- getInstrumentation().getTargetContext().getApplicationContext());
-
- // Run test.
- ContextUtils.initApplicationContextForTests(context);
- MinidumpUploadService.tryUploadCrashDumpWithLocalId("f297dbcba7a2d0bb");
+ AdvancedMockContext context =
+ new MinidumpPreparationContext(getInstrumentation().getTargetContext());
+
+ // Run test.
+ MinidumpUploadService.tryUploadCrashDumpWithLocalId(context, "f297dbcba7a2d0bb");
// Verify.
final File expectedRenamedMinidumpFile =
@@ -431,7 +422,7 @@
// Set up prerequisites.
final String startServiceFlag = "startServiceFlag";
MinidumpPreparationContext context = new MinidumpPreparationContext(
- getInstrumentation().getTargetContext().getApplicationContext()) {
+ getInstrumentation().getTargetContext()) {
@Override
public ComponentName startService(Intent unused) {
setFlag(startServiceFlag);
@@ -440,7 +431,7 @@
};
// Run test.
- MinidumpUploadService.tryUploadCrashDumpWithLocalId("f297dbcba7a2d0bb");
+ MinidumpUploadService.tryUploadCrashDumpWithLocalId(context, "f297dbcba7a2d0bb");
// Verify.
assertFalse(
@@ -454,11 +445,11 @@
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) return;
// Set up prerequisites.
- AdvancedMockContext context = new MinidumpPreparationContext(
- getInstrumentation().getTargetContext().getApplicationContext());
-
- // Run test.
- MinidumpUploadService.tryUploadCrashDumpWithLocalId("f297dbcba7a2d0bb");
+ AdvancedMockContext context =
+ new MinidumpPreparationContext(getInstrumentation().getTargetContext());
+
+ // Run test.
+ MinidumpUploadService.tryUploadCrashDumpWithLocalId(context, "f297dbcba7a2d0bb");
// Verify.
assertFalse("Should not have tried to schedule an upload job",
@@ -478,7 +469,7 @@
BOUNDARY);
final String startServiceFlag = "startServiceFlag";
MinidumpPreparationContext context = new MinidumpPreparationContext(
- getInstrumentation().getTargetContext().getApplicationContext()) {
+ getInstrumentation().getTargetContext()) {
@Override
public ComponentName startService(Intent unused) {
setFlag(startServiceFlag);
@@ -487,7 +478,7 @@
};
// Run test.
- MinidumpUploadService.tryUploadCrashDumpWithLocalId("f297dbcba7a2d0bb");
+ MinidumpUploadService.tryUploadCrashDumpWithLocalId(context, "f297dbcba7a2d0bb");
// Verify.
assertFalse(
@@ -505,11 +496,11 @@
setUpMinidumpFile(
new File(mCrashDir, "chromium-renderer-minidump-f297dbcba7a2d0bb.up0.try0"),
BOUNDARY);
- AdvancedMockContext context = new MinidumpPreparationContext(
- getInstrumentation().getTargetContext().getApplicationContext());
-
- // Run test.
- MinidumpUploadService.tryUploadCrashDumpWithLocalId("f297dbcba7a2d0bb");
+ AdvancedMockContext context =
+ new MinidumpPreparationContext(getInstrumentation().getTargetContext());
+
+ // Run test.
+ MinidumpUploadService.tryUploadCrashDumpWithLocalId(context, "f297dbcba7a2d0bb");
// Verify.
assertFalse("Should not have tried to schedule an upload job",
@@ -561,6 +552,11 @@
public MinidumpPreparationContext(Context targetContext, MinidumpUploadService service) {
super(targetContext);
mService = service;
+ }
+
+ @Override
+ public File getCacheDir() {
+ return mCacheDir;
}
@Override
« no previous file with comments | « chrome/android/javatests/src/org/chromium/chrome/browser/crash/LogcatExtractionRunnableTest.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/history/HistoryActivityTest.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698