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

Unified Diff: sync/internal_api/public/base_node.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: Rebase and fix conflicts 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 | « sync/internal_api/public/base/unique_position_unittest.cc ('k') | sync/internal_api/public/change_record.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/internal_api/public/base_node.h
diff --git a/sync/internal_api/public/base_node.h b/sync/internal_api/public/base_node.h
index 709f423d8b2eab1cfe0adfa07a2ee8ac9feb00aa..a439c65cae91bfd1ab7388a0ebf162cda81130db 100644
--- a/sync/internal_api/public/base_node.h
+++ b/sync/internal_api/public/base_node.h
@@ -8,12 +8,12 @@
#include <stddef.h>
#include <stdint.h>
+#include <memory>
#include <string>
#include <vector>
#include "base/gtest_prod_util.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/time/time.h"
#include "sync/api/attachments/attachment.h"
#include "sync/base/sync_export.h"
@@ -235,7 +235,7 @@ class SYNC_EXPORT BaseNode {
sync_pb::EntitySpecifics unencrypted_data_;
// Same as |unencrypted_data_|, but for legacy password encryption.
- scoped_ptr<sync_pb::PasswordSpecificsData> password_data_;
+ std::unique_ptr<sync_pb::PasswordSpecificsData> password_data_;
DISALLOW_COPY_AND_ASSIGN(BaseNode);
};
« no previous file with comments | « sync/internal_api/public/base/unique_position_unittest.cc ('k') | sync/internal_api/public/change_record.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698