Calls ShortcutHelper::FinalizeLauncherIcon() on worker thread instead of on 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"
@@ skipping 218 matching lines @@
   ScopedJavaLocalRef<jobject> java_splash_image =
       gfx::ConvertToJavaBitmap(&splash_image);
 
   Java_ShortcutHelper_storeWebappSplashImage(
       env,
       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);
+SkBitmap ShortcutHelper::FinalizeLauncherIconInBackground(
+    const SkBitmap& bitmap,
+    const GURL& url,
+    bool* is_generated) {
+  DCHECK(content::BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread());
 
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jobject> result;
   *is_generated = false;
 
   if (!bitmap.isNull()) {
     if (Java_ShortcutHelper_isIconLargeEnoughForLauncher(env, bitmap.width(),
                                                          bitmap.height())) {
       ScopedJavaLocalRef<jobject> java_bitmap =
           gfx::ConvertToJavaBitmap(&bitmap);
@@ skipping 52 matching lines @@
   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);
 }