Revert of Android: Remove GetApplicationContext part 2

chrome/android/java/src/org/chromium/chrome/browser/ServiceTabLauncher.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;
 
+import android.content.Context;
 import android.content.Intent;
 import android.os.AsyncTask;
 
-import org.chromium.base.ContextUtils;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType;
 import org.chromium.chrome.browser.tabmodel.document.AsyncTabCreationParams;
 import org.chromium.chrome.browser.tabmodel.document.TabDelegate;
 import org.chromium.chrome.browser.webapps.ChromeWebApkHost;
 import org.chromium.chrome.browser.webapps.WebappDataStorage;
 import org.chromium.chrome.browser.webapps.WebappRegistry;
 import org.chromium.content_public.browser.LoadUrlParams;
 import org.chromium.content_public.browser.WebContents;
@@ skipping 11 matching lines @@
  * URLs within the scope of a recently launched standalone-capable web app on the Android home
  * screen are launched in the standalone web app frame.
  */
 public class ServiceTabLauncher {
     // Name of the extra containing the Id of a tab launch request id.
     public static final String LAUNCH_REQUEST_ID_EXTRA =
             "org.chromium.chrome.browser.ServiceTabLauncher.LAUNCH_REQUEST_ID";
 
     /**
      * Launches the browser activity and launches a tab for |url|.
-     *  @param requestId Id of the request for launching this tab.
+     *
+     * @param context The context using which the URL is being loaded.
+     * @param requestId Id of the request for launching this tab.
      * @param incognito Whether the tab should be launched in incognito mode.
      * @param url The URL which should be launched in a tab.
      * @param disposition The disposition requested by the navigation source.
      * @param referrerUrl URL of the referrer which is opening the page.
      * @param referrerPolicy The referrer policy to consider when applying the referrer.
      * @param extraHeaders Extra headers to apply when requesting the tab's URL.
      * @param postData Post-data to include in the tab URL's request body.
      */
     @CalledByNative
-    public static void launchTab(final int requestId, final boolean incognito, final String url,
-            final int disposition, final String referrerUrl, final int referrerPolicy,
-            final String extraHeaders, final ResourceRequestBody postData) {
+    public static void launchTab(final Context context, final int requestId,
+            final boolean incognito, final String url, final int disposition,
+            final String referrerUrl, final int referrerPolicy, final String extraHeaders,
+            final ResourceRequestBody postData) {
         final TabDelegate tabDelegate = new TabDelegate(incognito);
 
         // 1. Launch WebAPK if one matches the target URL.
         if (ChromeWebApkHost.isEnabled()) {
-            String webApkPackageName =
-                    WebApkValidator.queryWebApkPackage(ContextUtils.getApplicationContext(), url);
+            String webApkPackageName = WebApkValidator.queryWebApkPackage(context, url);
             if (webApkPackageName != null) {
                 Intent intent =
                         WebApkNavigationClient.createLaunchWebApkIntent(webApkPackageName, url);
                 if (intent != null) {
                     intent.putExtra(ShortcutHelper.EXTRA_SOURCE, ShortcutSource.NOTIFICATION);
-                    ContextUtils.getApplicationContext().startActivity(intent);
+                    context.startActivity(intent);
                     return;
                 }
             }
         }
 
         // 2. Launch WebappActivity if one matches the target URL and was opened recently.
         // Otherwise, open the URL in a tab.
         final WebappDataStorage storage =
                 WebappRegistry.getInstance().getWebappDataStorageForUrl(url);
 
@@ skipping 49 matching lines @@
      * @param requestId Id of the tab launching request which has been fulfilled.
      * @param webContents The WebContents instance associated with this request.
      */
     public static void onWebContentsForRequestAvailable(int requestId, WebContents webContents) {
         nativeOnWebContentsForRequestAvailable(requestId, webContents);
     }
 
     private static native void nativeOnWebContentsForRequestAvailable(
             int requestId, WebContents webContents);
 }