Use ContextUtils#getApplicationContext() instead of passing Context to ShortcutHelper

chrome/browser/android/shortcut_helper.cc

 // Copyright 2013 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.
 
 #include "chrome/browser/android/shortcut_helper.h"
 
 #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"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/manifest/manifest_icon_downloader.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 11 matching lines @@
 static int kIdealSplashImageSize = -1;
 static int kMinimumSplashImageSize = -1;
 
 static int kDefaultRGBIconValue = 145;
 
 // Retrieves and caches the ideal and minimum sizes of the Home screen icon
 // and the splash screen image.
 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);
 
   // Check that the size returned is what is expected.
   DCHECK(sizes.size() == 4);
 
   // This ordering must be kept up to date with the Java ShortcutHelper.
   kIdealHomescreenIconSize = sizes[0];
   kMinimumHomescreenIconSize = sizes[1];
@@ skipping 38 matching lines @@
     // order to download the splash image and save it to the WebappDataStorage.
     // Create a copy of the callback here and send the pointer to Java, which
     // will send it back once the asynchronous shortcut creation process
     // finishes.
     callback_pointer =
         reinterpret_cast<uintptr_t>(new base::Closure(splash_image_callback));
   }
 
   Java_ShortcutHelper_addShortcut(
       env,
-      base::android::GetApplicationContext(),
       java_webapp_id.obj(),
       java_url.obj(),
       java_user_title.obj(),
       java_name.obj(),
       java_short_name.obj(),
       java_bitmap.obj(),
       info.display,
       info.orientation,
       info.source,
       info.theme_color,
@@ skipping 49 matching lines @@
     return;
 
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jstring> java_webapp_id =
       base::android::ConvertUTF8ToJavaString(env, webapp_id);
   ScopedJavaLocalRef<jobject> java_splash_image =
       gfx::ConvertToJavaBitmap(&splash_image);
 
   Java_ShortcutHelper_storeWebappSplashImage(
       env,
-      base::android::GetApplicationContext(),
       java_webapp_id.obj(),
       java_splash_image.obj());
 }
 
 // static
 SkBitmap ShortcutHelper::FinalizeLauncherIcon(const SkBitmap& bitmap,
                                               const GURL& url,
                                               bool* is_generated) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
 
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jobject> result;
   *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());
     }
   }
 
   if (result.is_null()) {
     ScopedJavaLocalRef<jstring> java_url =
         base::android::ConvertUTF8ToJavaString(env, url.spec());
     SkColor mean_color = SkColorSetRGB(
         kDefaultRGBIconValue, kDefaultRGBIconValue, kDefaultRGBIconValue);
 
     if (!bitmap.isNull())
       mean_color = color_utils::CalculateKMeanColorOfBitmap(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));
   }
 
   return gfx::CreateSkBitmapFromJavaBitmap(gfx::JavaBitmap(result.obj()));
 }
 
 // Callback used by Java when the shortcut has been created.
 // |splash_image_callback| is a pointer to a base::Closure allocated in
 // AddShortcutInBackgroundWithSkBitmap, so reinterpret_cast it back and run it.
 //
 // This callback should only ever be called when the shortcut was for a
 // webapp-capable site; otherwise, |splash_image_callback| will have never been
 // allocated and doesn't need to be run or deleted.
 void OnWebappDataStored(JNIEnv* env,
                         const JavaParamRef<jclass>& clazz,
                         jlong jsplash_image_callback) {
   DCHECK(jsplash_image_callback);
   base::Closure* splash_image_callback =
       reinterpret_cast<base::Closure*>(jsplash_image_callback);
   splash_image_callback->Run();
   delete splash_image_callback;
 }
 
 bool ShortcutHelper::RegisterShortcutHelper(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }