Calls ShortcutHelper::FinalizeLauncherIcon() on worker thread instead of on IO thread

chrome/browser/android/webapps/add_to_homescreen_data_fetcher.cc

 // 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.
 
 #include "chrome/browser/android/webapps/add_to_homescreen_data_fetcher.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/location.h"
 #include "base/strings/string16.h"
@@ skipping 193 matching lines @@
       threshold_to_get_any_largest_icon,
       base::Bind(&AddToHomescreenDataFetcher::OnFaviconFetched, this),
       &favicon_task_tracker_);
 }
 
 void AddToHomescreenDataFetcher::OnFaviconFetched(
     const favicon_base::FaviconRawBitmapResult& bitmap_result) {
   if (!web_contents() || !weak_observer_ || is_icon_saved_)
     return;
 
-  content::BrowserThread::PostTask(
-      content::BrowserThread::IO,
+  content::BrowserThread::GetBlockingPool()->PostWorkerTaskWithShutdownBehavior(
       FROM_HERE,
-      base::Bind(&AddToHomescreenDataFetcher::CreateLauncherIcon,
-                 this,
-                 bitmap_result));
+      base::Bind(&AddToHomescreenDataFetcher::CreateLauncherIconInBackground,
+                 this, shortcut_info_.url, bitmap_result),
+      base::SequencedWorkerPool::SKIP_ON_SHUTDOWN);
 }
 
-void AddToHomescreenDataFetcher::CreateLauncherIcon(
+void AddToHomescreenDataFetcher::CreateLauncherIconInBackground(
+    const GURL& page_url,
     const favicon_base::FaviconRawBitmapResult& bitmap_result) {
-  if (!web_contents() || !weak_observer_) return;
+  DCHECK(content::BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread());
 
-  DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   SkBitmap icon_bitmap;
   if (bitmap_result.is_valid()) {
     gfx::PNGCodec::Decode(bitmap_result.bitmap_data->front(),
                           bitmap_result.bitmap_data->size(),
                           &icon_bitmap);
   }
 
   bool is_generated = false;
   if (weak_observer_) {
-    icon_bitmap = weak_observer_->FinalizeLauncherIcon(icon_bitmap,
-                                                       shortcut_info_.url,
-                                                       &is_generated);
+    icon_bitmap = weak_observer_->FinalizeLauncherIconInBackground(
+        icon_bitmap, page_url, &is_generated);
   }
 
-  shortcut_info_.icon_url = is_generated ? GURL() : bitmap_result.icon_url;
+  GURL icon_url = is_generated ? GURL() : bitmap_result.icon_url;
   content::BrowserThread::PostTask(
       content::BrowserThread::UI, FROM_HERE,
-      base::Bind(&AddToHomescreenDataFetcher::NotifyObserver, this,
+      base::Bind(&AddToHomescreenDataFetcher::NotifyObserver, this, icon_url,
                  icon_bitmap));
 }
 
 void AddToHomescreenDataFetcher::OnManifestIconFetched(const GURL& icon_url,
                                                        const SkBitmap& icon) {
   if (icon.drawsNothing()) {
     FetchFavicon();
     return;
   }
-  shortcut_info_.icon_url = icon_url;
-  NotifyObserver(icon);
+  NotifyObserver(icon_url, icon);
 }
 
-void AddToHomescreenDataFetcher::NotifyObserver(const SkBitmap& bitmap) {
+void AddToHomescreenDataFetcher::NotifyObserver(const GURL& icon_url,
+                                                const SkBitmap& bitmap) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   if (!web_contents() || !weak_observer_ || is_icon_saved_)
     return;
 
   is_icon_saved_ = true;
+  shortcut_info_.icon_url = icon_url;
   shortcut_icon_ = bitmap;
   is_ready_ = true;
   weak_observer_->OnDataAvailable(shortcut_info_, shortcut_icon_);
 }
 
 GURL AddToHomescreenDataFetcher::GetShortcutUrl(const GURL& actual_url) {
   GURL original_url =
       dom_distiller::url_utils::GetOriginalUrlFromDistillerUrl(actual_url);
 
   // If URL points to an offline content, get original URL.
   GURL online_url =
       offline_pages::OfflinePageUtils::MaybeGetOnlineURLForOfflineURL(
           web_contents()->GetBrowserContext(), original_url);
   if (online_url.is_valid())
     return online_url;
 
   return original_url;
 }