Upstream: Create WebAPK when user selects "Add to Home screen"

chrome/browser/android/shortcut_helper.cc

Index: chrome/browser/android/shortcut_helper.cc
diff --git a/chrome/browser/android/shortcut_helper.cc b/chrome/browser/android/shortcut_helper.cc
index 0acad4c9ae003ff7f0814831c526bebf0da3750a..25dd8d960e463398d7e5c7c2fff4edd5d0605a24 100644
--- a/chrome/browser/android/shortcut_helper.cc
+++ b/chrome/browser/android/shortcut_helper.cc
@@ -6,7 +6,6 @@
 
 #include <jni.h>
 
-#include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
@@ -38,8 +37,7 @@ static int kDefaultRGBIconValue = 145;
 void GetHomescreenIconAndSplashImageSizes() {
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jintArray> java_size_array =
-      Java_ShortcutHelper_getHomeScreenIconAndSplashImageSizes(env,
-          base::android::GetApplicationContext());
+      Java_ShortcutHelper_getHomeScreenIconAndSplashImageSizes(env);
   std::vector<int> sizes;
   base::android::JavaIntArrayToIntVector(
       env, java_size_array.obj(), &sizes);
@@ -98,7 +96,6 @@ void ShortcutHelper::AddShortcutInBackgroundWithSkBitmap(
 
   Java_ShortcutHelper_addShortcut(
       env,
-      base::android::GetApplicationContext(),
       java_webapp_id.obj(),
       java_url.obj(),
       java_user_title.obj(),
@@ -168,7 +165,6 @@ void ShortcutHelper::StoreWebappSplashImage(
 
   Java_ShortcutHelper_storeWebappSplashImage(
       env,
-      base::android::GetApplicationContext(),
       java_webapp_id.obj(),
       java_splash_image.obj());
 }
@@ -184,13 +180,12 @@ SkBitmap ShortcutHelper::FinalizeLauncherIcon(const SkBitmap& bitmap,
   *is_generated = false;
 
   if (!bitmap.isNull()) {
-    if (Java_ShortcutHelper_isIconLargeEnoughForLauncher(
-            env, base::android::GetApplicationContext(), bitmap.width(),
-            bitmap.height())) {
+    if (Java_ShortcutHelper_isIconLargeEnoughForLauncher(env, bitmap.width(),
+                                                         bitmap.height())) {
       ScopedJavaLocalRef<jobject> java_bitmap =
           gfx::ConvertToJavaBitmap(&bitmap);
       result = Java_ShortcutHelper_createHomeScreenIconFromWebIcon(
-          env, base::android::GetApplicationContext(), java_bitmap.obj());
+          env, java_bitmap.obj());
     }
   }
 
@@ -205,8 +200,7 @@ SkBitmap ShortcutHelper::FinalizeLauncherIcon(const SkBitmap& bitmap,
 
     *is_generated = true;
     result = Java_ShortcutHelper_generateHomeScreenIcon(
-        env, base::android::GetApplicationContext(), java_url.obj(),
-        SkColorGetR(mean_color), SkColorGetG(mean_color),
+        env, java_url.obj(), SkColorGetR(mean_color), SkColorGetG(mean_color),
         SkColorGetB(mean_color));
   }