| OLD | NEW | 
|---|
| 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 "chrome/browser/sync/api/sync_data.h" | 5 #include "chrome/browser/sync/api/sync_data.h" | 
| 6 | 6 | 
| 7 #include <ostream> | 7 #include <ostream> | 
| 8 | 8 | 
| 9 #include "base/json/json_writer.h" | 9 #include "base/json/json_writer.h" | 
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" | 
| 11 #include "base/string_number_conversions.h" | 11 #include "base/string_number_conversions.h" | 
| 12 #include "base/values.h" | 12 #include "base/values.h" | 
| 13 #include "chrome/browser/sync/internal_api/base_node.h" | 13 #include "chrome/browser/sync/internal_api/base_node.h" | 
| 14 #include "chrome/browser/sync/protocol/proto_value_conversions.h" | 14 #include "sync/protocol/proto_value_conversions.h" | 
| 15 #include "chrome/browser/sync/syncable/model_type.h" |  | 
| 16 #include "sync/protocol/sync.pb.h" | 15 #include "sync/protocol/sync.pb.h" | 
|  | 16 #include "sync/syncable/model_type.h" | 
| 17 | 17 | 
| 18 void SyncData::ImmutableSyncEntityTraits::InitializeWrapper( | 18 void SyncData::ImmutableSyncEntityTraits::InitializeWrapper( | 
| 19     Wrapper* wrapper) { | 19     Wrapper* wrapper) { | 
| 20   *wrapper = new sync_pb::SyncEntity(); | 20   *wrapper = new sync_pb::SyncEntity(); | 
| 21 } | 21 } | 
| 22 | 22 | 
| 23 void SyncData::ImmutableSyncEntityTraits::DestroyWrapper( | 23 void SyncData::ImmutableSyncEntityTraits::DestroyWrapper( | 
| 24     Wrapper* wrapper) { | 24     Wrapper* wrapper) { | 
| 25   delete *wrapper; | 25   delete *wrapper; | 
| 26 } | 26 } | 
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 129   } | 129   } | 
| 130 | 130 | 
| 131   std::string id = base::Int64ToString(GetRemoteId()); | 131   std::string id = base::Int64ToString(GetRemoteId()); | 
| 132   return "{ isLocal: false, type: " + type + ", specifics: " + specifics + | 132   return "{ isLocal: false, type: " + type + ", specifics: " + specifics + | 
| 133       ", id: " + id + "}"; | 133       ", id: " + id + "}"; | 
| 134 } | 134 } | 
| 135 | 135 | 
| 136 void PrintTo(const SyncData& sync_data, std::ostream* os) { | 136 void PrintTo(const SyncData& sync_data, std::ostream* os) { | 
| 137   *os << sync_data.ToString(); | 137   *os << sync_data.ToString(); | 
| 138 } | 138 } | 
| OLD | NEW | 
|---|