OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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/base64.h" | 12 #include "base/base64.h" |
13 #include "base/location.h" | 13 #include "base/location.h" |
14 #include "base/metrics/histogram.h" | 14 #include "base/metrics/histogram.h" |
15 #include "base/string_number_conversions.h" | 15 #include "base/strings/string_number_conversions.h" |
16 #include "sync/engine/conflict_resolver.h" | 16 #include "sync/engine/conflict_resolver.h" |
17 #include "sync/engine/syncer_proto_util.h" | 17 #include "sync/engine/syncer_proto_util.h" |
18 #include "sync/engine/syncer_types.h" | 18 #include "sync/engine/syncer_types.h" |
19 #include "sync/internal_api/public/base/model_type.h" | 19 #include "sync/internal_api/public/base/model_type.h" |
20 #include "sync/internal_api/public/base/unique_position.h" | 20 #include "sync/internal_api/public/base/unique_position.h" |
21 #include "sync/protocol/bookmark_specifics.pb.h" | 21 #include "sync/protocol/bookmark_specifics.pb.h" |
22 #include "sync/protocol/password_specifics.pb.h" | 22 #include "sync/protocol/password_specifics.pb.h" |
23 #include "sync/protocol/sync.pb.h" | 23 #include "sync/protocol/sync.pb.h" |
24 #include "sync/syncable/directory.h" | 24 #include "sync/syncable/directory.h" |
25 #include "sync/syncable/entry.h" | 25 #include "sync/syncable/entry.h" |
(...skipping 615 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
641 if (update.version() < target->Get(SERVER_VERSION)) { | 641 if (update.version() < target->Get(SERVER_VERSION)) { |
642 LOG(WARNING) << "Update older than current server version for " | 642 LOG(WARNING) << "Update older than current server version for " |
643 << *target << " Update:" | 643 << *target << " Update:" |
644 << SyncerProtoUtil::SyncEntityDebugString(update); | 644 << SyncerProtoUtil::SyncEntityDebugString(update); |
645 return VERIFY_SUCCESS; // Expected in new sync protocol. | 645 return VERIFY_SUCCESS; // Expected in new sync protocol. |
646 } | 646 } |
647 return VERIFY_UNDECIDED; | 647 return VERIFY_UNDECIDED; |
648 } | 648 } |
649 | 649 |
650 } // namespace syncer | 650 } // namespace syncer |
OLD | NEW |