Make web_app::ShortcutInfo RefCountedThreadSafe (1)

chrome/browser/web_applications/web_app_mac_unittest.mm

 // Copyright (c) 2012 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/web_applications/web_app_mac.h"
 
 #import <Cocoa/Cocoa.h>
 #include <errno.h>
 #include <stddef.h>
 #include <sys/xattr.h>
 
 #include <memory>
 
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/macros.h"
 #include "base/path_service.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #import "chrome/common/mac/app_mode_common.h"
 #include "chrome/grit/theme_resources.h"
 #include "components/version_info/version_info.h"
+#include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #import "testing/gtest_mac.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 
 using ::testing::_;
 using ::testing::Return;
 using ::testing::NiceMock;
@@ skipping 10 matching lines @@
 
   MOCK_CONST_METHOD0(GetApplicationsDirname, base::FilePath());
   MOCK_CONST_METHOD1(GetAppBundleById,
                      base::FilePath(const std::string& bundle_id));
   MOCK_CONST_METHOD0(RevealAppShimInFinder, void());
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WebAppShortcutCreatorMock);
 };
 
-std::unique_ptr<web_app::ShortcutInfo> GetShortcutInfo() {
-  std::unique_ptr<web_app::ShortcutInfo> info(new web_app::ShortcutInfo);
+scoped_refptr<web_app::ShortcutInfo> GetShortcutInfo() {
+  scoped_refptr<web_app::ShortcutInfo> info(new web_app::ShortcutInfo);
   info->extension_id = "extensionid";
   info->extension_path = base::FilePath("/fake/extension/path");
   info->title = base::ASCIIToUTF16("Shortcut Title");
   info->url = GURL("http://example.com/");
   info->profile_path = base::FilePath("user_data_dir").Append("Profile 1");
   info->profile_name = "profile name";
   info->version_for_display = "stable 1.0";
   info->from_bookmark = false;
   return info;
 }
@@ skipping 10 matching lines @@
     app_data_dir_ = temp_app_data_dir_.GetPath();
     destination_dir_ = temp_destination_dir_.GetPath();
 
     info_ = GetShortcutInfo();
     shim_base_name_ = base::FilePath(info_->profile_path.BaseName().value() +
                                      " " + info_->extension_id + ".app");
     internal_shim_path_ = app_data_dir_.Append(shim_base_name_);
     shim_path_ = destination_dir_.Append(shim_base_name_);
   }
 
+  content::TestBrowserThreadBundle thread_bundle_;
+
   base::ScopedTempDir temp_app_data_dir_;
   base::ScopedTempDir temp_destination_dir_;
   base::FilePath app_data_dir_;
   base::FilePath destination_dir_;
 
-  std::unique_ptr<web_app::ShortcutInfo> info_;
+  scoped_refptr<web_app::ShortcutInfo> info_;
   base::FilePath shim_base_name_;
   base::FilePath internal_shim_path_;
   base::FilePath shim_path_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WebAppShortcutCreatorTest);
 };
 
 
 }  // namespace
@@ skipping 223 matching lines @@
       .Times(0);
   EXPECT_TRUE(shortcut_creator.CreateShortcuts(
       SHORTCUT_CREATION_AUTOMATED, web_app::ShortcutLocations()));
 
   EXPECT_CALL(shortcut_creator, RevealAppShimInFinder());
   EXPECT_TRUE(shortcut_creator.CreateShortcuts(
       SHORTCUT_CREATION_BY_USER, web_app::ShortcutLocations()));
 }
 
 }  // namespace web_app