gfx::Image: Added thread checker.

chrome/browser/web_applications/update_shortcut_worker_win.cc

 // Copyright 2014 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/web_applications/update_shortcut_worker_win.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 
@@ skipping 68 matching lines @@
   // to download the icon.
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   if (!web_contents_) {
     DeleteMe();  // We are done if underlying WebContents is gone.
     return;
   }
 
   if (unprocessed_icons_.empty()) {
     // No app icon. Just use the favicon from WebContents.
+    // TODO(mgiuca): This Image is passed to the FILE thread while still being
+    // used on the UI thread. This is not thread-safe and needs to be fixed.
+    // Remove this thread-check disable. https://crbug.com/596348.
+    shortcut_info_->favicon.DisableThreadChecking();
     UpdateShortcuts();
     return;
   }
 
   int preferred_size = std::max(unprocessed_icons_.back().width,
                                 unprocessed_icons_.back().height);
   web_contents_->DownloadImage(
       unprocessed_icons_.back().url,
       true,  // favicon
       0,  // no maximum size
@@ skipping 24 matching lines @@
       original_sizes, requested_sizes_in_pixel, &closest_indices, NULL);
 
   SkBitmap bitmap;
   if (!bitmaps.empty()) {
      size_t closest_index = closest_indices[0];
      bitmap = bitmaps[closest_index];
   }
 
   if (!bitmap.isNull()) {
     // Update icon with download image and update shortcut.
-    shortcut_info_->favicon.Add(gfx::Image::CreateFrom1xBitmap(bitmap));
+    gfx::Image icon = gfx::Image::CreateFrom1xBitmap(bitmap);
+    // |icon| will be used on the FILE thread, so detach it from this thread.
+    icon.DetachFromThread();
+    shortcut_info_->favicon.Add(icon);
     extensions::TabHelper* extensions_tab_helper =
         extensions::TabHelper::FromWebContents(web_contents_);
     extensions_tab_helper->SetAppIcon(bitmap);
     UpdateShortcuts();
   } else {
     // Try the next icon otherwise.
     DownloadIcon();
   }
 }
 
@@ skipping 102 matching lines @@
                  base::Unretained(this)));
   }
 }
 
 void UpdateShortcutWorker::DeleteMeOnUIThread() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   delete this;
 }
 
 }  // namespace web_app