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 "components/sync/engine_impl/apply_control_data_updates.h" | 5 #include "components/sync/engine_impl/apply_control_data_updates.h" |
6 | 6 |
7 #include <stdint.h> | 7 #include <stdint.h> |
8 | 8 |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
11 #include "base/metrics/histogram.h" | 11 #include "base/metrics/histogram_macros.h" |
12 #include "components/sync/base/cryptographer.h" | 12 #include "components/sync/base/cryptographer.h" |
13 #include "components/sync/engine_impl/conflict_resolver.h" | 13 #include "components/sync/engine_impl/conflict_resolver.h" |
14 #include "components/sync/engine_impl/conflict_util.h" | 14 #include "components/sync/engine_impl/conflict_util.h" |
15 #include "components/sync/engine_impl/syncer_util.h" | 15 #include "components/sync/engine_impl/syncer_util.h" |
16 #include "components/sync/syncable/directory.h" | 16 #include "components/sync/syncable/directory.h" |
17 #include "components/sync/syncable/mutable_entry.h" | 17 #include "components/sync/syncable/mutable_entry.h" |
18 #include "components/sync/syncable/nigori_handler.h" | 18 #include "components/sync/syncable/nigori_handler.h" |
19 #include "components/sync/syncable/nigori_util.h" | 19 #include "components/sync/syncable/nigori_util.h" |
20 #include "components/sync/syncable/syncable_write_transaction.h" | 20 #include "components/sync/syncable/syncable_write_transaction.h" |
21 | 21 |
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
209 ConflictResolver::OVERWRITE_LOCAL, | 209 ConflictResolver::OVERWRITE_LOCAL, |
210 ConflictResolver::CONFLICT_RESOLUTION_SIZE); | 210 ConflictResolver::CONFLICT_RESOLUTION_SIZE); |
211 } | 211 } |
212 | 212 |
213 UpdateAttemptResponse response = | 213 UpdateAttemptResponse response = |
214 AttemptToUpdateEntry(trans, entry, cryptographer); | 214 AttemptToUpdateEntry(trans, entry, cryptographer); |
215 DCHECK_EQ(SUCCESS, response); | 215 DCHECK_EQ(SUCCESS, response); |
216 } | 216 } |
217 | 217 |
218 } // namespace syncer | 218 } // namespace syncer |
OLD | NEW |