Make web_app::ShortcutInfo RefCountedThreadSafe (1)

chrome/browser/web_applications/web_app_win.cc

Index: chrome/browser/web_applications/web_app_win.cc
diff --git a/chrome/browser/web_applications/web_app_win.cc b/chrome/browser/web_applications/web_app_win.cc
index 467217fd737637a1158285a4adfe603c4e73abd6..59c7a8c40cb15e8dc944230e09b6673ecee2b3c9 100644
--- a/chrome/browser/web_applications/web_app_win.cc
+++ b/chrome/browser/web_applications/web_app_win.cc
@@ -339,7 +339,7 @@ void GetShortcutLocationsAndDeleteShortcuts(
 void CreateIconAndSetRelaunchDetails(
     const base::FilePath& web_app_path,
     const base::FilePath& icon_file,
-    std::unique_ptr<web_app::ShortcutInfo> shortcut_info,
+    scoped_refptr<web_app::ShortcutInfo> shortcut_info,
     HWND hwnd) {
   DCHECK(content::BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread());
 
@@ -366,7 +366,7 @@ void CreateIconAndSetRelaunchDetails(
 
 void OnShortcutInfoLoadedForSetRelaunchDetails(
     HWND hwnd,
-    std::unique_ptr<web_app::ShortcutInfo> shortcut_info) {
+    scoped_refptr<web_app::ShortcutInfo> shortcut_info) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   // Set window's icon to the one we're about to create/update in the web app
@@ -378,7 +378,7 @@ void OnShortcutInfoLoadedForSetRelaunchDetails(
       web_app::internals::GetIconFilePath(web_app_path, shortcut_info->title);
   content::BrowserThread::PostBlockingPoolTask(
       FROM_HERE, base::Bind(&CreateIconAndSetRelaunchDetails, web_app_path,
-                            icon_file, base::Passed(&shortcut_info), hwnd));
+                            icon_file, std::move(shortcut_info), hwnd));
 }
 
 }  // namespace
@@ -387,7 +387,7 @@ namespace web_app {
 
 base::FilePath CreateShortcutInWebAppDir(
     const base::FilePath& web_app_dir,
-    std::unique_ptr<ShortcutInfo> shortcut_info) {
+    scoped_refptr<ShortcutInfo> shortcut_info) {
   std::vector<base::FilePath> paths;
   paths.push_back(web_app_dir);
   std::vector<base::FilePath> out_filenames;
@@ -442,11 +442,10 @@ bool CheckAndSaveIcon(const base::FilePath& icon_file,
   return true;
 }
 
-bool CreatePlatformShortcuts(
-    const base::FilePath& web_app_path,
-    std::unique_ptr<ShortcutInfo> shortcut_info,
-    const ShortcutLocations& creation_locations,
-    ShortcutCreationReason creation_reason) {
+bool CreatePlatformShortcuts(const base::FilePath& web_app_path,
+                             scoped_refptr<ShortcutInfo> shortcut_info,
+                             const ShortcutLocations& creation_locations,
+                             ShortcutCreationReason creation_reason) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::FILE);
 
   // Nothing to do on Windows for hidden apps.
@@ -489,7 +488,7 @@ bool CreatePlatformShortcuts(
 
 void UpdatePlatformShortcuts(const base::FilePath& web_app_path,
                              const base::string16& old_app_title,
-                             std::unique_ptr<ShortcutInfo> shortcut_info) {
+                             scoped_refptr<ShortcutInfo> shortcut_info) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::FILE);
 
   // Generates file name to use with persisted ico and shortcut file.
@@ -527,7 +526,7 @@ void UpdatePlatformShortcuts(const base::FilePath& web_app_path,
 }
 
 void DeletePlatformShortcuts(const base::FilePath& web_app_path,
-                             std::unique_ptr<ShortcutInfo> shortcut_info) {
+                             scoped_refptr<ShortcutInfo> shortcut_info) {
   GetShortcutLocationsAndDeleteShortcuts(web_app_path,
                                          shortcut_info->profile_path,
                                          shortcut_info->title, NULL, NULL);