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

Unified Diff: components/rlz/rlz_tracker.h

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/resource_provider/resource_provider_test_app.cc ('k') | components/rlz/rlz_tracker.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/rlz/rlz_tracker.h
diff --git a/components/rlz/rlz_tracker.h b/components/rlz/rlz_tracker.h
index aa7a4d0be9c603870495242517615d22080eb2e1..0721173e1deea96edb9ef07c9de3343bdb3935cd 100644
--- a/components/rlz/rlz_tracker.h
+++ b/components/rlz/rlz_tracker.h
@@ -6,10 +6,10 @@
#define COMPONENTS_RLZ_RLZ_TRACKER_H_
#include <map>
+#include <memory>
#include <string>
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/singleton.h"
#include "base/strings/string16.h"
#include "base/threading/sequenced_worker_pool.h"
@@ -39,7 +39,7 @@ class RLZTracker {
public:
// Sets the RLZTrackerDelegate that should be used by the global RLZTracker
// instance. Must be called before calling any other method of RLZTracker.
- static void SetRlzDelegate(scoped_ptr<RLZTrackerDelegate> delegate);
+ static void SetRlzDelegate(std::unique_ptr<RLZTrackerDelegate> delegate);
// Initializes the RLZ library services for use in chrome. Schedules a delayed
// task that performs the ping and registers some events when 'first-run' is
@@ -128,7 +128,7 @@ class RLZTracker {
friend class base::RefCountedThreadSafe<RLZTracker>;
// Implementation called from SetRlzDelegate() static method.
- void SetDelegate(scoped_ptr<RLZTrackerDelegate> delegate);
+ void SetDelegate(std::unique_ptr<RLZTrackerDelegate> delegate);
// Implementation called from InitRlzDelayed() static method.
bool Init(bool first_run,
@@ -200,7 +200,7 @@ class RLZTracker {
static RLZTracker* tracker_;
// Delegate abstracting embedder specific knowledge. Must not be null.
- scoped_ptr<RLZTrackerDelegate> delegate_;
+ std::unique_ptr<RLZTrackerDelegate> delegate_;
// Configuation data for RLZ tracker. Set by call to Init().
bool first_run_;
« no previous file with comments | « components/resource_provider/resource_provider_test_app.cc ('k') | components/rlz/rlz_tracker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698