Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1530)

Unified Diff: chrome/installer/util/shell_util_unittest.cc

Issue 1878313003: Convert //chrome/installer from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert decompress.cc in mini_installer. Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/installer/util/shell_util.cc ('k') | chrome/installer/util/uninstall_metrics.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/util/shell_util_unittest.cc
diff --git a/chrome/installer/util/shell_util_unittest.cc b/chrome/installer/util/shell_util_unittest.cc
index 2ae2309ccf89c288692a85ab8745a0abe8e53a88..b46b755a3e214a233b13d4d868b15396977061a9 100644
--- a/chrome/installer/util/shell_util_unittest.cc
+++ b/chrome/installer/util/shell_util_unittest.cc
@@ -6,6 +6,7 @@
#include <stddef.h>
+#include <memory>
#include <vector>
#include "base/base_paths.h"
@@ -17,7 +18,6 @@
#include "base/files/scoped_temp_dir.h"
#include "base/macros.h"
#include "base/md5.h"
-#include "base/memory/scoped_ptr.h"
#include "base/strings/string16.h"
#include "base/strings/string_util.h"
#include "base/synchronization/cancellation_flag.h"
@@ -190,7 +190,7 @@ class ShellUtilShortcutTest : public testing::Test {
}
BrowserDistribution* dist_;
- scoped_ptr<installer::Product> product_;
+ std::unique_ptr<installer::Product> product_;
// A ShellUtil::ShortcutProperties object with common properties set already.
ShellUtil::ShortcutProperties test_properties_;
@@ -202,11 +202,11 @@ class ShellUtilShortcutTest : public testing::Test {
base::ScopedTempDir fake_default_user_quick_launch_;
base::ScopedTempDir fake_start_menu_;
base::ScopedTempDir fake_common_start_menu_;
- scoped_ptr<base::ScopedPathOverride> user_desktop_override_;
- scoped_ptr<base::ScopedPathOverride> common_desktop_override_;
- scoped_ptr<base::ScopedPathOverride> user_quick_launch_override_;
- scoped_ptr<base::ScopedPathOverride> start_menu_override_;
- scoped_ptr<base::ScopedPathOverride> common_start_menu_override_;
+ std::unique_ptr<base::ScopedPathOverride> user_desktop_override_;
+ std::unique_ptr<base::ScopedPathOverride> common_desktop_override_;
+ std::unique_ptr<base::ScopedPathOverride> user_quick_launch_override_;
+ std::unique_ptr<base::ScopedPathOverride> start_menu_override_;
+ std::unique_ptr<base::ScopedPathOverride> common_start_menu_override_;
base::FilePath chrome_exe_;
base::FilePath manganese_exe_;
« no previous file with comments | « chrome/installer/util/shell_util.cc ('k') | chrome/installer/util/uninstall_metrics.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698