| 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 "sync/engine/syncer_util.h" | 5 #include "sync/engine/syncer_util.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <set> | 8 #include <set> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| 11 | 11 |
| 12 #include "base/location.h" | 12 #include "base/location.h" |
| 13 #include "base/metrics/histogram.h" | 13 #include "base/metrics/histogram.h" |
| 14 #include "sync/engine/conflict_resolver.h" | 14 #include "sync/engine/conflict_resolver.h" |
| 15 #include "sync/engine/syncer_proto_util.h" | 15 #include "sync/engine/syncer_proto_util.h" |
| 16 #include "sync/engine/syncer_types.h" | 16 #include "sync/engine/syncer_types.h" |
| 17 #include "sync/internal_api/public/base/model_type.h" | 17 #include "sync/internal_api/public/base/model_type.h" |
| 18 #include "sync/internal_api/public/util/time.h" |
| 18 #include "sync/protocol/bookmark_specifics.pb.h" | 19 #include "sync/protocol/bookmark_specifics.pb.h" |
| 19 #include "sync/protocol/password_specifics.pb.h" | 20 #include "sync/protocol/password_specifics.pb.h" |
| 20 #include "sync/protocol/sync.pb.h" | 21 #include "sync/protocol/sync.pb.h" |
| 21 #include "sync/syncable/directory.h" | 22 #include "sync/syncable/directory.h" |
| 22 #include "sync/syncable/entry.h" | 23 #include "sync/syncable/entry.h" |
| 23 #include "sync/syncable/mutable_entry.h" | 24 #include "sync/syncable/mutable_entry.h" |
| 24 #include "sync/syncable/read_transaction.h" | 25 #include "sync/syncable/read_transaction.h" |
| 25 #include "sync/syncable/syncable_changes_version.h" | 26 #include "sync/syncable/syncable_changes_version.h" |
| 26 #include "sync/syncable/syncable_proto_util.h" | 27 #include "sync/syncable/syncable_proto_util.h" |
| 27 #include "sync/syncable/syncable_util.h" | 28 #include "sync/syncable/syncable_util.h" |
| 28 #include "sync/syncable/write_transaction.h" | 29 #include "sync/syncable/write_transaction.h" |
| 29 #include "sync/util/cryptographer.h" | 30 #include "sync/util/cryptographer.h" |
| 30 #include "sync/util/time.h" | |
| 31 | 31 |
| 32 namespace syncer { | 32 namespace syncer { |
| 33 | 33 |
| 34 using syncable::BASE_VERSION; | 34 using syncable::BASE_VERSION; |
| 35 using syncable::CHANGES_VERSION; | 35 using syncable::CHANGES_VERSION; |
| 36 using syncable::CREATE_NEW_UPDATE_ITEM; | 36 using syncable::CREATE_NEW_UPDATE_ITEM; |
| 37 using syncable::CTIME; | 37 using syncable::CTIME; |
| 38 using syncable::Directory; | 38 using syncable::Directory; |
| 39 using syncable::Entry; | 39 using syncable::Entry; |
| 40 using syncable::GET_BY_HANDLE; | 40 using syncable::GET_BY_HANDLE; |
| (...skipping 604 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 645 if (update.version() < target->Get(SERVER_VERSION)) { | 645 if (update.version() < target->Get(SERVER_VERSION)) { |
| 646 LOG(WARNING) << "Update older than current server version for " | 646 LOG(WARNING) << "Update older than current server version for " |
| 647 << *target << " Update:" | 647 << *target << " Update:" |
| 648 << SyncerProtoUtil::SyncEntityDebugString(update); | 648 << SyncerProtoUtil::SyncEntityDebugString(update); |
| 649 return VERIFY_SUCCESS; // Expected in new sync protocol. | 649 return VERIFY_SUCCESS; // Expected in new sync protocol. |
| 650 } | 650 } |
| 651 return VERIFY_UNDECIDED; | 651 return VERIFY_UNDECIDED; |
| 652 } | 652 } |
| 653 | 653 |
| 654 } // namespace syncer | 654 } // namespace syncer |
| OLD | NEW |