Commit 42fe2cee authored by Daniel Cheng's avatar Daniel Cheng Committed by Commit Bot

Store a base::Location in syncer::syncable::WriteTransactionInfo

This class used to hold the location as a string, since base::Location
wasn't assignable. It is now.

Bug: 764195
Change-Id: I81a04d2ecc981c39f0e0bcb54cb76e6ee87248f8
Reviewed-on: https://chromium-review.googlesource.com/664220Reviewed-by: default avatarBrett Wilson <brettw@chromium.org>
Reviewed-by: default avatarStanislav Chiknavaryan <stanisc@chromium.org>
Commit-Queue: Daniel Cheng <dcheng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#501455}
parent 43d61726
...@@ -17,10 +17,7 @@ WriteTransactionInfo::WriteTransactionInfo( ...@@ -17,10 +17,7 @@ WriteTransactionInfo::WriteTransactionInfo(
base::Location location, base::Location location,
WriterTag writer, WriterTag writer,
ImmutableEntryKernelMutationMap mutations) ImmutableEntryKernelMutationMap mutations)
: id(id), : id(id), location_(location), writer(writer), mutations(mutations) {}
location_string(location.ToString()),
writer(writer),
mutations(mutations) {}
WriteTransactionInfo::WriteTransactionInfo() : id(-1), writer(INVALID) {} WriteTransactionInfo::WriteTransactionInfo() : id(-1), writer(INVALID) {}
...@@ -33,7 +30,7 @@ std::unique_ptr<base::DictionaryValue> WriteTransactionInfo::ToValue( ...@@ -33,7 +30,7 @@ std::unique_ptr<base::DictionaryValue> WriteTransactionInfo::ToValue(
size_t max_mutations_size) const { size_t max_mutations_size) const {
auto dict = std::make_unique<base::DictionaryValue>(); auto dict = std::make_unique<base::DictionaryValue>();
dict->SetString("id", base::Int64ToString(id)); dict->SetString("id", base::Int64ToString(id));
dict->SetString("location", location_string); dict->SetString("location", location_.ToString());
dict->SetString("writer", WriterTagToString(writer)); dict->SetString("writer", WriterTagToString(writer));
std::unique_ptr<base::Value> mutations_value; std::unique_ptr<base::Value> mutations_value;
const size_t mutations_size = mutations.Get().size(); const size_t mutations_size = mutations.Get().size();
......
...@@ -32,9 +32,7 @@ struct WriteTransactionInfo { ...@@ -32,9 +32,7 @@ struct WriteTransactionInfo {
size_t max_mutations_size) const; size_t max_mutations_size) const;
int64_t id; int64_t id;
// If base::Location becomes assignable, we can use that base::Location location_;
// instead.
std::string location_string;
WriterTag writer; WriterTag writer;
ImmutableEntryKernelMutationMap mutations; ImmutableEntryKernelMutationMap mutations;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment