Fixed thread-unsafe use of gfx::Image in app shortcut creation.

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 <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 21 matching lines @@
 using content::WebContents;
 
 namespace web_app {
 
 UpdateShortcutWorker::UpdateShortcutWorker(WebContents* web_contents)
     : web_contents_(web_contents),
       profile_path_(Profile::FromBrowserContext(
           web_contents->GetBrowserContext())->GetPath()) {
   extensions::TabHelper* extensions_tab_helper =
       extensions::TabHelper::FromWebContents(web_contents);
-  web_app::GetShortcutInfoForTab(web_contents_, &shortcut_info_);
+  shortcut_info_ = web_app::GetShortcutInfoForTab(web_contents_);
   web_app::GetIconsInfo(extensions_tab_helper->web_app_info(),
                         &unprocessed_icons_);
-  file_name_ = web_app::internals::GetSanitizedFileName(shortcut_info_.title);
+  file_name_ = web_app::internals::GetSanitizedFileName(shortcut_info_->title);
 
   registrar_.Add(
       this,
       chrome::NOTIFICATION_TAB_CLOSING,
       content::Source<NavigationController>(&web_contents->GetController()));
 }
 
 void UpdateShortcutWorker::Run() {
   // Starting by downloading app icon.
   DownloadIcon();
@@ skipping 54 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));
+    shortcut_info_->favicon.Add(gfx::Image::CreateFrom1xBitmap(bitmap));
     extensions::TabHelper* extensions_tab_helper =
         extensions::TabHelper::FromWebContents(web_contents_);
     extensions_tab_helper->SetAppIcon(bitmap);
     UpdateShortcuts();
   } else {
     // Try the next icon otherwise.
     DownloadIcon();
   }
 }
 
@@ skipping 41 matching lines @@
 void UpdateShortcutWorker::UpdateShortcuts() {
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
       base::Bind(&UpdateShortcutWorker::UpdateShortcutsOnFileThread,
                  base::Unretained(this)));
 }
 
 void UpdateShortcutWorker::UpdateShortcutsOnFileThread() {
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
 
   base::FilePath web_app_path = web_app::GetWebAppDataDirectory(
-      profile_path_, shortcut_info_.extension_id, shortcut_info_.url);
+      profile_path_, shortcut_info_->extension_id, shortcut_info_->url);
 
   // Ensure web_app_path exists. web_app_path could be missing for a legacy
   // shortcut created by Gears.
   if (!base::PathExists(web_app_path) &&
       !base::CreateDirectory(web_app_path)) {
     NOTREACHED();
     return;
   }
 
   base::FilePath icon_file =
-      web_app::internals::GetIconFilePath(web_app_path, shortcut_info_.title);
-  web_app::internals::CheckAndSaveIcon(icon_file, shortcut_info_.favicon, true);
+      web_app::internals::GetIconFilePath(web_app_path, shortcut_info_->title);
+  web_app::internals::CheckAndSaveIcon(icon_file, shortcut_info_->favicon,
+                                       true);
 
   // Update existing shortcuts' description, icon and app id.
   CheckExistingShortcuts();
   if (!shortcut_files_.empty()) {
     // Generates app id from web app url and profile path.
     base::string16 app_id = ShellIntegration::GetAppModelIdForProfile(
         base::UTF8ToWide(
-            web_app::GenerateApplicationNameFromURL(shortcut_info_.url)),
+            web_app::GenerateApplicationNameFromURL(shortcut_info_->url)),
         profile_path_);
 
     // Sanitize description
-    if (shortcut_info_.description.length() >= MAX_PATH)
-      shortcut_info_.description.resize(MAX_PATH - 1);
+    if (shortcut_info_->description.length() >= MAX_PATH)
+      shortcut_info_->description.resize(MAX_PATH - 1);
 
     for (size_t i = 0; i < shortcut_files_.size(); ++i) {
       base::win::ShortcutProperties shortcut_properties;
       shortcut_properties.set_target(shortcut_files_[i]);
-      shortcut_properties.set_description(shortcut_info_.description);
+      shortcut_properties.set_description(shortcut_info_->description);
       shortcut_properties.set_icon(icon_file, 0);
       shortcut_properties.set_app_id(app_id);
       base::win::CreateOrUpdateShortcutLink(
           shortcut_files_[i], shortcut_properties,
           base::win::SHORTCUT_UPDATE_EXISTING);
     }
   }
 
   OnShortcutsUpdated(true);
 }
@@ skipping 11 matching lines @@
                  base::Unretained(this)));
   }
 }
 
 void UpdateShortcutWorker::DeleteMeOnUIThread() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   delete this;
 }
 
 }  // namespace web_app