Run ShortcutHelper::AddToLauncherInBackgroundWithSkBitmap() on Worker thread instead of IO thread

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/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/command_line.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/android/webapk/webapk_installer.h"
 #include "chrome/browser/manifest/manifest_icon_downloader.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/browser_thread.h"

[dominickn, 2016/08/10 05:18:10]

Remove unnecessary browser_thread.h include

[pkotwicz, 2016/08/10 20:28:43]

The include is still needed for the DCHECK() in
ShortcutHelper::FinalizeLauncherIconInBackground()

 #include "content/public/browser/web_contents.h"
 #include "jni/ShortcutHelper_jni.h"
 #include "ui/gfx/android/java_bitmap.h"
 #include "ui/gfx/color_analysis.h"
 #include "url/gurl.h"
 
 using base::android::JavaParamRef;
 using base::android::ScopedJavaLocalRef;
 using content::Manifest;
 
@@ skipping 26 matching lines @@
   kMinimumSplashImageSize = sizes[3];
 
   // Try to ensure that the data returned is sane.
   DCHECK(kMinimumHomescreenIconSize <= kIdealHomescreenIconSize);
   DCHECK(kMinimumSplashImageSize <= kIdealSplashImageSize);
 }
 
 } // anonymous namespace
 
 // static
-void ShortcutHelper::AddToLauncherInBackgroundWithSkBitmap(
+void ShortcutHelper::AddToLauncherWithSkBitmap(
     content::BrowserContext* browser_context,
     const ShortcutInfo& info,
     const std::string& webapp_id,
     const SkBitmap& icon_bitmap,
     const base::Closure& splash_image_callback) {
-  DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-
   if (info.display == blink::WebDisplayModeStandalone ||
       info.display == blink::WebDisplayModeFullscreen) {
     if (base::CommandLine::ForCurrentProcess()->HasSwitch(
             switches::kEnableWebApk)) {
-      InstallWebApkInBackgroundWithSkBitmap(browser_context, info, icon_bitmap);
+      InstallWebApkWithSkBitmap(browser_context, info, icon_bitmap);
       return;
     }
-    AddWebappInBackgroundWithSkBitmap(info, webapp_id, icon_bitmap,
-                                      splash_image_callback);
+    AddWebappWithSkBitmap(info, webapp_id, icon_bitmap, splash_image_callback);
     return;
   }
-  AddShortcutInBackgroundWithSkBitmap(info, icon_bitmap);
+  AddShortcutWithSkBitmap(info, icon_bitmap);
 }
 
 // static
-void ShortcutHelper::InstallWebApkInBackgroundWithSkBitmap(
+void ShortcutHelper::InstallWebApkWithSkBitmap(
     content::BrowserContext* browser_context,
     const ShortcutInfo& info,
     const SkBitmap& icon_bitmap) {
-  DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   // WebApkInstaller destroys itself when it is done.
   WebApkInstaller* installer = new WebApkInstaller(info, icon_bitmap);
   installer->InstallAsync(browser_context,
                           base::Bind(&ShortcutHelper::OnBuiltWebApk));
 }
 
 // static
-void ShortcutHelper::AddWebappInBackgroundWithSkBitmap(
+void ShortcutHelper::AddWebappWithSkBitmap(
     const ShortcutInfo& info,
     const std::string& webapp_id,
     const SkBitmap& icon_bitmap,
     const base::Closure& splash_image_callback) {
-  DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-
   // Send the data to the Java side to create the shortcut.
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jstring> java_webapp_id =
       base::android::ConvertUTF8ToJavaString(env, webapp_id);
   ScopedJavaLocalRef<jstring> java_url =
       base::android::ConvertUTF8ToJavaString(env, info.url.spec());
   ScopedJavaLocalRef<jstring> java_scope_url =
       base::android::ConvertUTF8ToJavaString(env, info.scope.spec());
   ScopedJavaLocalRef<jstring> java_user_title =
       base::android::ConvertUTF16ToJavaString(env, info.user_title);
@@ skipping 25 matching lines @@
       java_icon_url.obj(),
       java_bitmap.obj(),
       info.display,
       info.orientation,
       info.source,
       info.theme_color,
       info.background_color,
       callback_pointer);
 }
 
-void ShortcutHelper::AddShortcutInBackgroundWithSkBitmap(
+void ShortcutHelper::AddShortcutWithSkBitmap(
     const ShortcutInfo& info,
     const SkBitmap& icon_bitmap) {
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jstring> java_url =
       base::android::ConvertUTF8ToJavaString(env, info.url.spec());
   ScopedJavaLocalRef<jstring> java_user_title =
       base::android::ConvertUTF16ToJavaString(env, info.user_title);
   ScopedJavaLocalRef<jobject> java_bitmap;
   if (icon_bitmap.getSize())
     java_bitmap = gfx::ConvertToJavaBitmap(&icon_bitmap);
@@ skipping 123 matching lines @@
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jstring> java_url =
       base::android::ConvertUTF8ToJavaString(env, url.spec());
   ScopedJavaLocalRef<jstring> java_scope_url =
       Java_ShortcutHelper_getScopeFromUrl(env, java_url.obj());
   return GURL(base::android::ConvertJavaStringToUTF16(env, java_scope_url));
 }
 
 // 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.
+// AddShortcutWithSkBitmap, 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);
 }