Reland r145993.

Original codereview at http://codereview.chromium.org/10766016/

[Sync] Add location parameter to SyncChange in Sync API.

SyncChanges now require the location they were created as a parameter. This
is then used in the case that the change violates and invariant. We display
the location and type of erroneous change in about:sync, in addition to
disabling the offending datatype.

TBR=stevet@chromium.org, rlarocque@chromium.org
BUG=135108
TEST=unit_tests


Review URL: https://chromiumcodereview.appspot.com/10690128

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146050 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 9 insertions, 4 deletions

diff --git a/sync/api/sync_change.cc b/sync/api/sync_change.cc
index 64da5b7..ee1cdea 100644
--- a/sync/api/sync_change.cc
+++ b/sync/api/sync_change.cc
@@ -11,8 +11,12 @@ namespace syncer {
 SyncChange::SyncChange() : change_type_(ACTION_INVALID) {
 }
 
-SyncChange::SyncChange(SyncChangeType change_type, const SyncData& sync_data)
-    : change_type_(change_type),
+SyncChange::SyncChange(
+    const tracked_objects::Location& from_here,
+    SyncChangeType change_type,
+    const SyncData& sync_data)
+    : location_(from_here),
+      change_type_(change_type),
       sync_data_(sync_data) {
   DCHECK(IsValid());
 }
@@ -66,8 +70,9 @@ std::string SyncChange::ChangeTypeToString(SyncChangeType change_type) {
 }
 
 std::string SyncChange::ToString() const {
-  return "{ changeType: " + ChangeTypeToString(change_type_) +
-      ", syncData: " + sync_data_.ToString() + "}";
+  return "{ " + location_.ToString() + ", changeType: " +
+      ChangeTypeToString(change_type_) + ", syncData: " +
+      sync_data_.ToString() + "}";
 }
 
 void PrintTo(const SyncChange& sync_change, std::ostream* os) {