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

chrome/browser/ui/app_list/app_list_service_mac.mm

 // 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.
 
 #import "chrome/browser/ui/app_list/app_list_service_mac.h"
 
 #include <ApplicationServices/ApplicationServices.h>
 #import <Cocoa/Cocoa.h>
 
 #include "base/bind.h"
@@ skipping 68 matching lines @@
 
 // Version of the app list shortcut version installed.
 const int kShortcutVersion = 2;
 
 // Duration of show and hide animations.
 const NSTimeInterval kAnimationDuration = 0.2;
 
 // Distance towards the screen edge that the app list moves from when showing.
 const CGFloat kDistanceMovedOnShow = 20;
 
-web_app::ShortcutInfo GetAppListShortcutInfo(
+scoped_ptr<web_app::ShortcutInfo> GetAppListShortcutInfo(
     const base::FilePath& profile_path) {
-  web_app::ShortcutInfo shortcut_info;
+  scoped_ptr<web_app::ShortcutInfo> shortcut_info(new web_app::ShortcutInfo);
   chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
   if (channel == chrome::VersionInfo::CHANNEL_CANARY) {
-    shortcut_info.title =
+    shortcut_info->title =
         l10n_util::GetStringUTF16(IDS_APP_LIST_SHORTCUT_NAME_CANARY);
   } else {
-    shortcut_info.title = l10n_util::GetStringUTF16(IDS_APP_LIST_SHORTCUT_NAME);
+    shortcut_info->title =
+        l10n_util::GetStringUTF16(IDS_APP_LIST_SHORTCUT_NAME);
   }
 
-  shortcut_info.extension_id = app_mode::kAppListModeId;
-  shortcut_info.description = shortcut_info.title;
-  shortcut_info.profile_path = profile_path;
+  shortcut_info->extension_id = app_mode::kAppListModeId;
+  shortcut_info->description = shortcut_info->title;
+  shortcut_info->profile_path = profile_path;
 
   return shortcut_info;
 }
 
 void CreateAppListShim(const base::FilePath& profile_path) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   WebApplicationInfo web_app_info;
-  web_app::ShortcutInfo shortcut_info =
+  scoped_ptr<web_app::ShortcutInfo> shortcut_info =
       GetAppListShortcutInfo(profile_path);
 
   ResourceBundle& resource_bundle = ResourceBundle::GetSharedInstance();
   chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
   if (channel == chrome::VersionInfo::CHANNEL_CANARY) {
 #if defined(GOOGLE_CHROME_BUILD)
-    shortcut_info.favicon.Add(
+    shortcut_info->favicon.Add(
         *resource_bundle.GetImageSkiaNamed(IDR_APP_LIST_CANARY_16));
-    shortcut_info.favicon.Add(
+    shortcut_info->favicon.Add(
         *resource_bundle.GetImageSkiaNamed(IDR_APP_LIST_CANARY_32));
-    shortcut_info.favicon.Add(
+    shortcut_info->favicon.Add(
         *resource_bundle.GetImageSkiaNamed(IDR_APP_LIST_CANARY_128));
-    shortcut_info.favicon.Add(
+    shortcut_info->favicon.Add(
         *resource_bundle.GetImageSkiaNamed(IDR_APP_LIST_CANARY_256));
 #else
     NOTREACHED();
 #endif
   } else {
-    shortcut_info.favicon.Add(
+    shortcut_info->favicon.Add(
         *resource_bundle.GetImageSkiaNamed(IDR_APP_LIST_16));
-    shortcut_info.favicon.Add(
+    shortcut_info->favicon.Add(
         *resource_bundle.GetImageSkiaNamed(IDR_APP_LIST_32));
-    shortcut_info.favicon.Add(
+    shortcut_info->favicon.Add(
         *resource_bundle.GetImageSkiaNamed(IDR_APP_LIST_128));
-    shortcut_info.favicon.Add(
+    shortcut_info->favicon.Add(
         *resource_bundle.GetImageSkiaNamed(IDR_APP_LIST_256));
   }
 
   web_app::ShortcutLocations shortcut_locations;
   PrefService* local_state = g_browser_process->local_state();
   int installed_version =
       local_state->GetInteger(prefs::kAppLauncherShortcutVersion);
 
   // If this is a first-time install, add a dock icon. Otherwise just update
   // the target, and wait for OSX to refresh its icon caches. This might not
   // occur until a reboot, but OSX does not offer a nicer way. Deleting cache
   // files on disk and killing processes can easily result in icon corruption.
   if (installed_version == 0)
     shortcut_locations.in_quick_launch_bar = true;
 
-  web_app::CreateNonAppShortcut(shortcut_locations, shortcut_info);
+  web_app::CreateNonAppShortcut(shortcut_locations, shortcut_info.Pass());
 
   local_state->SetInteger(prefs::kAppLauncherShortcutVersion,
                           kShortcutVersion);
 }
 
 NSRunningApplication* ActiveApplicationNotChrome() {
   NSArray* applications = [[NSWorkspace sharedWorkspace] runningApplications];
   for (NSRunningApplication* application in applications) {
     if (![application isActive])
       continue;
@@ skipping 410 matching lines @@
 
 - (void)animationDidEnd:(NSAnimation*)animation {
   content::BrowserThread::PostTask(
       content::BrowserThread::UI,
       FROM_HERE,
       base::Bind(&AppListServiceMac::WindowAnimationDidEnd,
                  base::Unretained(GetActiveInstance())));
 }
 
 @end