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

chrome/browser/apps/app_shim/app_shim_interactive_uitest_mac.mm

 // 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.
 
 #import <Cocoa/Cocoa.h>
 #include <vector>
 
 #include "apps/app_lifetime_monitor_factory.h"
 #include "apps/switches.h"
 #include "base/auto_reset.h"
@@ skipping 247 matching lines @@
 bool HasAppShimHost(Profile* profile, const std::string& app_id) {
   return g_browser_process->platform_part()
       ->app_shim_host_manager()
       ->extension_app_shim_handler()
       ->FindHost(profile, app_id);
 }
 
 base::FilePath GetAppShimPath(Profile* profile,
                               const extensions::Extension* app) {
   // Use a WebAppShortcutCreator to get the path.
+  scoped_ptr<web_app::ShortcutInfo> shortcut_info =
+      web_app::ShortcutInfoForExtensionAndProfile(app, profile);
   web_app::WebAppShortcutCreator shortcut_creator(
       web_app::GetWebAppDataDirectory(profile->GetPath(), app->id(), GURL()),
-      web_app::ShortcutInfoForExtensionAndProfile(app, profile),
-      extensions::FileHandlersInfo());
+      *shortcut_info, extensions::FileHandlersInfo());
   return shortcut_creator.GetInternalShortcutPath();
 }
 
 void UpdateAppAndAwaitShimCreation(Profile* profile,
                                    const extensions::Extension* app,
                                    const base::FilePath& shim_path) {
   // Create the internal app shim by simulating an app update. FilePathWatcher
   // is used to wait for file operations on the shim to be finished before
   // attempting to launch it. Since all of the file operations are done in the
   // same event on the FILE thread, everything will be done by the time the
@@ skipping 360 matching lines @@
   base::FilePath test_data_dir;
   PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
   base::FilePath shim_path_32 =
       test_data_dir.Append("app_shim").Append("app_shim_32_bit.app");
   EXPECT_TRUE(base::PathExists(shim_path_32));
 
   // Install test app.
   const extensions::Extension* app = InstallPlatformApp("minimal");
 
   // Use WebAppShortcutCreator to create a 64 bit shim.
+  scoped_ptr<web_app::ShortcutInfo> shortcut_info =
+      web_app::ShortcutInfoForExtensionAndProfile(app, profile());
   web_app::WebAppShortcutCreator shortcut_creator(
       web_app::GetWebAppDataDirectory(profile()->GetPath(), app->id(), GURL()),
-      web_app::ShortcutInfoForExtensionAndProfile(app, profile()),
-      extensions::FileHandlersInfo());
+      *shortcut_info, extensions::FileHandlersInfo());
   shortcut_creator.UpdateShortcuts();
   base::FilePath shim_path = shortcut_creator.GetInternalShortcutPath();
   NSMutableDictionary* plist_64 = [NSMutableDictionary
       dictionaryWithContentsOfFile:base::mac::FilePathToNSString(
           shim_path.Append("Contents").Append("Info.plist"))];
 
   // Copy 32 bit shim to where it's expected to be.
   // CopyDirectory doesn't seem to work when copying and renaming in one go.
   ASSERT_TRUE(base::DeleteFile(shim_path, true));
   ASSERT_TRUE(base::PathExists(shim_path.DirName()));
@@ skipping 49 matching lines @@
   // the shim is rebuilt.
   WindowedAppShimLaunchObserver(app->id()).Wait();
 
   EXPECT_TRUE(GetFirstAppWindow());
   EXPECT_TRUE(HasAppShimHost(profile(), app->id()));
 }
 
 #endif  // defined(ARCH_CPU_64_BITS)
 
 }  // namespace apps