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

Side by Side Diff: components/sync/syncable/write_transaction_info.cc

Issue 2287733002: Switch //components away from base::ListValue::Append(Value*) overload. (Closed)
Patch Set: Test fix Created 4 years, 3 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/sync/syncable/write_transaction_info.h" 5 #include "components/sync/syncable/write_transaction_info.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include "base/memory/ptr_util.h"
10 #include "base/strings/string_number_conversions.h" 11 #include "base/strings/string_number_conversions.h"
11 12
12 namespace syncer { 13 namespace syncer {
13 namespace syncable { 14 namespace syncable {
14 15
15 WriteTransactionInfo::WriteTransactionInfo( 16 WriteTransactionInfo::WriteTransactionInfo(
16 int64_t id, 17 int64_t id,
17 tracked_objects::Location location, 18 tracked_objects::Location location,
18 WriterTag writer, 19 WriterTag writer,
19 ImmutableEntryKernelMutationMap mutations) 20 ImmutableEntryKernelMutationMap mutations)
20 : id(id), 21 : id(id),
21 location_string(location.ToString()), 22 location_string(location.ToString()),
22 writer(writer), 23 writer(writer),
23 mutations(mutations) {} 24 mutations(mutations) {}
24 25
25 WriteTransactionInfo::WriteTransactionInfo() : id(-1), writer(INVALID) {} 26 WriteTransactionInfo::WriteTransactionInfo() : id(-1), writer(INVALID) {}
26 27
27 WriteTransactionInfo::WriteTransactionInfo(const WriteTransactionInfo& other) = 28 WriteTransactionInfo::WriteTransactionInfo(const WriteTransactionInfo& other) =
28 default; 29 default;
29 30
30 WriteTransactionInfo::~WriteTransactionInfo() {} 31 WriteTransactionInfo::~WriteTransactionInfo() {}
31 32
32 base::DictionaryValue* WriteTransactionInfo::ToValue( 33 base::DictionaryValue* WriteTransactionInfo::ToValue(
33 size_t max_mutations_size) const { 34 size_t max_mutations_size) const {
34 base::DictionaryValue* dict = new base::DictionaryValue(); 35 base::DictionaryValue* dict = new base::DictionaryValue();
35 dict->SetString("id", base::Int64ToString(id)); 36 dict->SetString("id", base::Int64ToString(id));
36 dict->SetString("location", location_string); 37 dict->SetString("location", location_string);
37 dict->SetString("writer", WriterTagToString(writer)); 38 dict->SetString("writer", WriterTagToString(writer));
38 base::Value* mutations_value = NULL; 39 std::unique_ptr<base::Value> mutations_value;
39 const size_t mutations_size = mutations.Get().size(); 40 const size_t mutations_size = mutations.Get().size();
40 if (mutations_size <= max_mutations_size) { 41 if (mutations_size <= max_mutations_size) {
41 mutations_value = EntryKernelMutationMapToValue(mutations.Get()); 42 mutations_value = EntryKernelMutationMapToValue(mutations.Get());
42 } else { 43 } else {
43 mutations_value = new base::StringValue( 44 mutations_value = base::MakeUnique<base::StringValue>(
44 base::SizeTToString(mutations_size) + " mutations"); 45 base::SizeTToString(mutations_size) + " mutations");
45 } 46 }
46 dict->Set("mutations", mutations_value); 47 dict->Set("mutations", std::move(mutations_value));
47 return dict; 48 return dict;
48 } 49 }
49 50
50 } // namespace syncable 51 } // namespace syncable
51 } // namespace syncer 52 } // namespace syncer
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698