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

Unified Diff: sync/syncable/syncable_id.h

Issue 1866243002: Convert //sync 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
Index: sync/syncable/syncable_id.h
diff --git a/sync/syncable/syncable_id.h b/sync/syncable/syncable_id.h
index b2c0edfb890b4863c58a8c0a7ada9e4a77db0f5c..7dd09d8155175bb15164c0dffe7f45885467c9a8 100644
--- a/sync/syncable/syncable_id.h
+++ b/sync/syncable/syncable_id.h
@@ -7,11 +7,11 @@
#include <iosfwd>
#include <limits>
+#include <memory>
#include <sstream>
#include <string>
#include "base/containers/hash_tables.h"
-#include "base/memory/scoped_ptr.h"
#include "sync/base/sync_export.h"
namespace base {
@@ -106,8 +106,8 @@ class SYNC_EXPORT Id {
static Id GetRoot();
private:
- friend scoped_ptr<EntryKernel> UnpackEntry(sql::Statement* statement,
- int* total_created_entries);
+ friend std::unique_ptr<EntryKernel> UnpackEntry(sql::Statement* statement,
+ int* total_created_entries);
friend void BindFields(const EntryKernel& entry,
sql::Statement* statement);
SYNC_EXPORT friend std::ostream& operator<<(std::ostream& out, const Id& id);

Powered by Google App Engine
This is Rietveld 408576698