Revert of Android: Remove GetApplicationContext part 2

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // 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;
 import static org.chromium.chrome.browser.crash.MinidumpUploadService.OTHER;
 import static org.chromium.chrome.browser.crash.MinidumpUploadService.RENDERER;
 
 import android.annotation.TargetApi;
 import android.app.job.JobInfo;
 import android.app.job.JobScheduler;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
 import android.os.Handler;
 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;
 import org.chromium.components.background_task_scheduler.TaskIds;
 import org.chromium.components.minidump_uploader.CrashTestCase;
 import org.chromium.components.minidump_uploader.MinidumpUploadCallable;
 import org.chromium.components.minidump_uploader.util.CrashReportingPermissionManager;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 import org.chromium.net.NetworkChangeNotifier;
@@ skipping 50 matching lines @@
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) return;
 
         // Setup prerequisites.
         final AtomicInteger numServiceStarts = new AtomicInteger(0);
         final File[] minidumpFiles = {
                 new File(mCrashDir, "chromium_renderer-111.dmp1"),
                 new File(mCrashDir, "chromium_renderer-222.dmp2"),
                 new File(mCrashDir, "chromium_renderer-333.dmp3"),
         };
         MinidumpPreparationContext context = new MinidumpPreparationContext(
-                getInstrumentation().getTargetContext().getApplicationContext()) {
+                getInstrumentation().getTargetContext()) {
             @Override
             public ComponentName startService(Intent intentToCheck) {
                 String filePath =
                         intentToCheck.getStringExtra(MinidumpUploadService.FILE_TO_UPLOAD_KEY);
                 // Assuming numServicesStart value corresponds to minidumpFiles index.
                 assertEquals("Action should be correct", MinidumpUploadService.ACTION_UPLOAD,
                         intentToCheck.getAction());
                 assertTrue("Should not call service more than number of files",
                         numServiceStarts.incrementAndGet() <= minidumpFiles.length);
                 assertEquals("Minidump path should be the absolute path",
                         minidumpFiles[numServiceStarts.intValue() - 1].getAbsolutePath(), filePath);
                 return new ComponentName(getPackageName(), MinidumpUploadService.class.getName());
             }
 
         };
         MinidumpUploadService service = new TestMinidumpUploadService(context);
         for (File minidumpFile : minidumpFiles) {
             setUpMinidumpFile(minidumpFile, BOUNDARY);
         }
 
         // Run test.
         service.onCreate();
-        ContextUtils.initApplicationContextForTests(context);
-        MinidumpUploadService.tryUploadAllCrashDumps();
+        MinidumpUploadService.tryUploadAllCrashDumps(context);
 
         // Verify.
         for (File minidumpFile : minidumpFiles) {
             assertTrue("Minidump file should exist: " + minidumpFile, minidumpFile.isFile());
         }
         assertEquals("Should have called startService() same number of times as there are files",
                 minidumpFiles.length, numServiceStarts.intValue());
     }
 
     @SmallTest
@@ skipping 106 matching lines @@
                         t.printStackTrace();
                         fail("Failed to trigger NetworkChangeNotifier");
                     }
                 }
             }
         };
         // Create a context that supports call to startService(...), where it runs the new service
         // 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 =
                         new HandlerThread("MinidumpUploadServiceTest Handler Thread");
                 handlerThread.start();
                 mHandler = new Handler(handlerThread.getLooper());
             }
 
             @Override
             public ComponentName startService(final Intent intentToCheck) {
@@ skipping 12 matching lines @@
         // We need the context before we can attach it to the service, so since Context is
         // dependent on the service, we do this after context creation.
         service.attachBaseContextLate(context);
         // Create the file used for uploading.
         File minidumpFile = new File(mCrashDir, "chromium_renderer-111.dmp1");
         minidumpFile.createNewFile();
         setUpMinidumpFile(minidumpFile, BOUNDARY);
 
         // Run test.
         service.onCreate();
-        ContextUtils.initApplicationContextForTests(context);
-        MinidumpUploadService.tryUploadCrashDump(minidumpFile);
+        MinidumpUploadService.tryUploadCrashDump(context, minidumpFile);
 
         // Verify asynchronously.
         CriteriaHelper.pollInstrumentationThread(
                 new Criteria("All callables should have a call-count of 1") {
                     @Override
                     public boolean isSatisfied() {
                         for (CountedMinidumpUploadCallable callable : callables) {
                             if (callable.mCalledCount != 1) {
                                 return false;
                             }
@@ skipping 12 matching lines @@
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) return;
 
         // Set up prerequisites.
         File minidumpFile =
                 new File(mCrashDir, "chromium-renderer-minidump-f297dbcba7a2d0bb.dmp0.try3");
         final File expectedRenamedMinidumpFile =
                 new File(mCrashDir, "chromium-renderer-minidump-f297dbcba7a2d0bb.forced0.try0");
         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());
                 String filePath =
                         intentToCheck.getStringExtra(MinidumpUploadService.FILE_TO_UPLOAD_KEY);
                 assertEquals("Minidump path should be for a fresh upload",
                         expectedRenamedMinidumpFile.getAbsolutePath(), filePath);
                 setFlag(startServiceFlag);
                 return new ComponentName(getPackageName(), MinidumpUploadService.class.getName());
             }
         };
 
         // Run test.
-        ContextUtils.initApplicationContextForTests(context);
-        MinidumpUploadService.tryUploadCrashDumpWithLocalId("f297dbcba7a2d0bb");
+        MinidumpUploadService.tryUploadCrashDumpWithLocalId(context, "f297dbcba7a2d0bb");
 
         // Verify.
         assertTrue("Should have called startService(...)", context.isFlagSet(startServiceFlag));
     }
 
     @SmallTest
     @Feature({"Android-AppBase"})
     public void testHandleForceUploadCrash_MinidumpFileExists_WithJobScheduler()
             throws IOException {
         // The JobScheduler API is only available as of Android M+.
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) return;
 
         // Set up prerequisites.
         setUpMinidumpFile(
                 new File(mCrashDir, "chromium-renderer-minidump-f297dbcba7a2d0bb.dmp0.try3"),
                 BOUNDARY);
-        AdvancedMockContext context = new MinidumpPreparationContext(
-                getInstrumentation().getTargetContext().getApplicationContext());
+        AdvancedMockContext context =
+                new MinidumpPreparationContext(getInstrumentation().getTargetContext());
 
         // Run test.
-        ContextUtils.initApplicationContextForTests(context);
-        MinidumpUploadService.tryUploadCrashDumpWithLocalId("f297dbcba7a2d0bb");
+        MinidumpUploadService.tryUploadCrashDumpWithLocalId(context, "f297dbcba7a2d0bb");
 
         // Verify.
         final File expectedRenamedMinidumpFile =
                 new File(mCrashDir, "chromium-renderer-minidump-f297dbcba7a2d0bb.forced0.try0");
         assertTrue("Should have renamed the minidump file for forced upload",
                 expectedRenamedMinidumpFile.exists());
         assertTrue("Should have tried to schedule an upload job",
                 context.isFlagSet(TestJobScheduler.SCHEDULE_JOB_FLAG));
     }
 
     @SmallTest
     @Feature({"Android-AppBase"})
     public void testHandleForceUploadCrash_SkippedMinidumpFileExists_SansJobScheduler()
             throws IOException {
         // The JobScheduler API is used on Android M+.
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) return;
 
         // Set up prerequisites.
         File minidumpFile =
                 new File(mCrashDir, "chromium-renderer-minidump-f297dbcba7a2d0bb.skipped0.try0");
         final File expectedRenamedMinidumpFile =
                 new File(mCrashDir, "chromium-renderer-minidump-f297dbcba7a2d0bb.forced0.try0");
         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());
                 String filePath =
                         intentToCheck.getStringExtra(MinidumpUploadService.FILE_TO_UPLOAD_KEY);
                 assertEquals("Minidump path should be for a fresh upload",
                         expectedRenamedMinidumpFile.getAbsolutePath(), filePath);
                 setFlag(startServiceFlag);
                 return new ComponentName(getPackageName(), MinidumpUploadService.class.getName());
             }
         };
 
         // Run test.
-        ContextUtils.initApplicationContextForTests(context);
-        MinidumpUploadService.tryUploadCrashDumpWithLocalId("f297dbcba7a2d0bb");
+        MinidumpUploadService.tryUploadCrashDumpWithLocalId(context, "f297dbcba7a2d0bb");
 
         // Verify.
         assertTrue("Should have called startService(...)", context.isFlagSet(startServiceFlag));
     }
 
     @SmallTest
     @Feature({"Android-AppBase"})
     public void testHandleForceUploadCrash_SkippedMinidumpFileExists_WithJobScheduler()
             throws IOException {
         // The JobScheduler API is only available as of Android M.
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) return;
 
         // Set up prerequisites.
         setUpMinidumpFile(
                 new File(mCrashDir, "chromium-renderer-minidump-f297dbcba7a2d0bb.skipped0.try3"),
                 BOUNDARY);
-        AdvancedMockContext context = new MinidumpPreparationContext(
-                getInstrumentation().getTargetContext().getApplicationContext());
+        AdvancedMockContext context =
+                new MinidumpPreparationContext(getInstrumentation().getTargetContext());
 
         // Run test.
-        ContextUtils.initApplicationContextForTests(context);
-        MinidumpUploadService.tryUploadCrashDumpWithLocalId("f297dbcba7a2d0bb");
+        MinidumpUploadService.tryUploadCrashDumpWithLocalId(context, "f297dbcba7a2d0bb");
 
         // Verify.
         final File expectedRenamedMinidumpFile =
                 new File(mCrashDir, "chromium-renderer-minidump-f297dbcba7a2d0bb.forced0.try0");
         assertTrue("Should have renamed the minidump file for forced upload",
                 expectedRenamedMinidumpFile.exists());
         assertTrue("Should have tried to schedule an upload job",
                 context.isFlagSet(TestJobScheduler.SCHEDULE_JOB_FLAG));
     }
 
     @SmallTest
     @Feature({"Android-AppBase"})
     public void testHandleForceUploadCrash_FileDoesntExist_SansJobScheduler() {
         // The JobScheduler API is used on Android M+.
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) return;
 
         // Set up prerequisites.
         final String startServiceFlag = "startServiceFlag";
         MinidumpPreparationContext context = new MinidumpPreparationContext(
-                getInstrumentation().getTargetContext().getApplicationContext()) {
+                getInstrumentation().getTargetContext()) {
             @Override
             public ComponentName startService(Intent unused) {
                 setFlag(startServiceFlag);
                 return new ComponentName(getPackageName(), MinidumpUploadService.class.getName());
             }
         };
 
         // Run test.
-        MinidumpUploadService.tryUploadCrashDumpWithLocalId("f297dbcba7a2d0bb");
+        MinidumpUploadService.tryUploadCrashDumpWithLocalId(context, "f297dbcba7a2d0bb");
 
         // Verify.
         assertFalse(
                 "Should not have called startService(...)", context.isFlagSet(startServiceFlag));
     }
 
     @SmallTest
     @Feature({"Android-AppBase"})
     public void testHandleForceUploadCrash_FileDoesntExist_WithJobScheduler() throws IOException {
         // The JobScheduler API is only available as of Android M.
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) return;
 
         // Set up prerequisites.
-        AdvancedMockContext context = new MinidumpPreparationContext(
-                getInstrumentation().getTargetContext().getApplicationContext());
+        AdvancedMockContext context =
+                new MinidumpPreparationContext(getInstrumentation().getTargetContext());
 
         // Run test.
-        MinidumpUploadService.tryUploadCrashDumpWithLocalId("f297dbcba7a2d0bb");
+        MinidumpUploadService.tryUploadCrashDumpWithLocalId(context, "f297dbcba7a2d0bb");
 
         // Verify.
         assertFalse("Should not have tried to schedule an upload job",
                 context.isFlagSet(TestJobScheduler.SCHEDULE_JOB_FLAG));
     }
 
     @SmallTest
     @Feature({"Android-AppBase"})
     public void testHandleForceUploadCrash_FileAlreadyUploaded_SansJobScheduler()
             throws IOException {
         // The JobScheduler API is used on Android M+.
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) return;
 
         // Set up prerequisites.
         setUpMinidumpFile(
                 new File(mCrashDir, "chromium-renderer-minidump-f297dbcba7a2d0bb.up0.try0"),
                 BOUNDARY);
         final String startServiceFlag = "startServiceFlag";
         MinidumpPreparationContext context = new MinidumpPreparationContext(
-                getInstrumentation().getTargetContext().getApplicationContext()) {
+                getInstrumentation().getTargetContext()) {
             @Override
             public ComponentName startService(Intent unused) {
                 setFlag(startServiceFlag);
                 return new ComponentName(getPackageName(), MinidumpUploadService.class.getName());
             }
         };
 
         // Run test.
-        MinidumpUploadService.tryUploadCrashDumpWithLocalId("f297dbcba7a2d0bb");
+        MinidumpUploadService.tryUploadCrashDumpWithLocalId(context, "f297dbcba7a2d0bb");
 
         // Verify.
         assertFalse(
                 "Should not have called startService(...)", context.isFlagSet(startServiceFlag));
     }
 
     @SmallTest
     @Feature({"Android-AppBase"})
     public void testHandleForceUploadCrash_FileAlreadyUploaded_WithJobScheduler()
             throws IOException {
         // The JobScheduler API is only available as of Android M.
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) return;
 
         // Set up prerequisites.
         setUpMinidumpFile(
                 new File(mCrashDir, "chromium-renderer-minidump-f297dbcba7a2d0bb.up0.try0"),
                 BOUNDARY);
-        AdvancedMockContext context = new MinidumpPreparationContext(
-                getInstrumentation().getTargetContext().getApplicationContext());
+        AdvancedMockContext context =
+                new MinidumpPreparationContext(getInstrumentation().getTargetContext());
 
         // Run test.
-        MinidumpUploadService.tryUploadCrashDumpWithLocalId("f297dbcba7a2d0bb");
+        MinidumpUploadService.tryUploadCrashDumpWithLocalId(context, "f297dbcba7a2d0bb");
 
         // Verify.
         assertFalse("Should not have tried to schedule an upload job",
                 context.isFlagSet(TestJobScheduler.SCHEDULE_JOB_FLAG));
     }
 
     @SmallTest
     @Feature({"Android-AppBase"})
     public void testGetCrashType1() throws IOException {
         final File minidumpFile = new File(mCrashDir, "chromium_renderer-123.dmp");
@@ skipping 34 matching lines @@
         public MinidumpPreparationContext(Context targetContext) {
             this(targetContext, null);
         }
 
         public MinidumpPreparationContext(Context targetContext, MinidumpUploadService service) {
             super(targetContext);
             mService = service;
         }
 
         @Override
+        public File getCacheDir() {
+            return mCacheDir;
+        }
+
+        @Override
         public Object getSystemService(String name) {
             if (Context.JOB_SCHEDULER_SERVICE.equals(name)) {
                 return new TestJobScheduler(this);
             }
 
             return super.getSystemService(name);
         }
     }
 
     /**
@@ skipping 58 matching lines @@
             this.mTriggerNetworkChange = networkChange;
         }
 
         @Override
         public Integer call() {
             ++mCalledCount;
             return mResult;
         }
     }
 }