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

Unified Diff: components/rlz/rlz_tracker_unittest.cc

Issue 1921923002: Convert //components/[o-t]* from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . 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 | « components/rlz/rlz_tracker.cc ('k') | components/safe_json/json_sanitizer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/rlz/rlz_tracker_unittest.cc
diff --git a/components/rlz/rlz_tracker_unittest.cc b/components/rlz/rlz_tracker_unittest.cc
index a9d29506f2178fc97612293a1227ba1f0e2c007d..31dc27dfb4d5edb641c6152f5f8a76f7d676f7a0 100644
--- a/components/rlz/rlz_tracker_unittest.cc
+++ b/components/rlz/rlz_tracker_unittest.cc
@@ -4,9 +4,11 @@
#include "components/rlz/rlz_tracker.h"
+#include <memory>
+
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/sequenced_worker_pool_owner.h"
@@ -257,7 +259,7 @@ class RlzLibTest : public testing::Test {
base::MessageLoop message_loop_;
TestRLZTrackerDelegate* delegate_;
- scoped_ptr<TestRLZTracker> tracker_;
+ std::unique_ptr<TestRLZTracker> tracker_;
RlzLibTestNoMachineStateHelper m_rlz_test_helper_;
};
@@ -267,7 +269,7 @@ void RlzLibTest::SetUp() {
delegate_ = new TestRLZTrackerDelegate;
tracker_.reset(new TestRLZTracker());
- RLZTracker::SetRlzDelegate(make_scoped_ptr(delegate_));
+ RLZTracker::SetRlzDelegate(base::WrapUnique(delegate_));
// Make sure a non-organic brand code is set in the registry or the RLZTracker
// is pretty much a no-op.
« no previous file with comments | « components/rlz/rlz_tracker.cc ('k') | components/safe_json/json_sanitizer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698