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

Unified Diff: sync/internal_api/public/sessions/sync_session_snapshot.cc

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/internal_api/public/sessions/sync_session_snapshot.cc
diff --git a/sync/internal_api/public/sessions/sync_session_snapshot.cc b/sync/internal_api/public/sessions/sync_session_snapshot.cc
index 624d5177d0df5e65d2d9ea90f5a7c7a9bf24e6ff..c88711a413d61a5dd4a705797f408659a2d8e39e 100644
--- a/sync/internal_api/public/sessions/sync_session_snapshot.cc
+++ b/sync/internal_api/public/sessions/sync_session_snapshot.cc
@@ -5,10 +5,11 @@
#include "sync/internal_api/public/sessions/sync_session_snapshot.h"
#include <stddef.h>
+
+#include <memory>
#include <utility>
#include "base/json/json_writer.h"
-#include "base/memory/scoped_ptr.h"
#include "base/values.h"
#include "sync/protocol/proto_enum_conversions.h"
@@ -62,8 +63,8 @@ SyncSessionSnapshot::SyncSessionSnapshot(const SyncSessionSnapshot& other) =
SyncSessionSnapshot::~SyncSessionSnapshot() {}
-scoped_ptr<base::DictionaryValue> SyncSessionSnapshot::ToValue() const {
- scoped_ptr<base::DictionaryValue> value(new base::DictionaryValue());
+std::unique_ptr<base::DictionaryValue> SyncSessionSnapshot::ToValue() const {
+ std::unique_ptr<base::DictionaryValue> value(new base::DictionaryValue());
value->SetInteger("numSuccessfulCommits",
model_neutral_state_.num_successful_commits);
value->SetInteger("numSuccessfulBookmarkCommits",
@@ -93,10 +94,11 @@ scoped_ptr<base::DictionaryValue> SyncSessionSnapshot::ToValue() const {
GetUpdatesSourceString(legacy_updates_source_));
value->SetBoolean("notificationsEnabled", notifications_enabled_);
- scoped_ptr<base::DictionaryValue> counter_entries(
+ std::unique_ptr<base::DictionaryValue> counter_entries(
new base::DictionaryValue());
for (int i = FIRST_REAL_MODEL_TYPE; i < MODEL_TYPE_COUNT; i++) {
- scoped_ptr<base::DictionaryValue> type_entries(new base::DictionaryValue());
+ std::unique_ptr<base::DictionaryValue> type_entries(
+ new base::DictionaryValue());
type_entries->SetInteger("numEntries", num_entries_by_type_[i]);
type_entries->SetInteger("numToDeleteEntries",
num_to_delete_entries_by_type_[i]);

Powered by Google App Engine
This is Rietveld 408576698