| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/api/fake_model_type_service.h" | 5 #include "components/sync/api/fake_model_type_service.h" |
| 6 | 6 |
| 7 #include <string> | |
| 8 | |
| 9 #include "base/bind.h" | 7 #include "base/bind.h" |
| 10 #include "base/memory/ptr_util.h" | 8 #include "base/memory/ptr_util.h" |
| 11 #include "components/sync/core/data_batch_impl.h" | 9 #include "components/sync/core/data_batch_impl.h" |
| 12 #include "components/sync/core/simple_metadata_change_list.h" | 10 #include "components/sync/core/simple_metadata_change_list.h" |
| 13 #include "components/sync/syncable/syncable_util.h" | 11 #include "components/sync/syncable/syncable_util.h" |
| 14 #include "testing/gtest/include/gtest/gtest.h" | 12 #include "testing/gtest/include/gtest/gtest.h" |
| 15 | 13 |
| 16 using sync_pb::EntitySpecifics; | 14 using sync_pb::EntitySpecifics; |
| 17 using sync_pb::EntityMetadata; | 15 using sync_pb::EntityMetadata; |
| 18 using sync_pb::DataTypeState; | 16 using sync_pb::DataTypeState; |
| (...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 314 void FakeModelTypeService::SetConflictResolution( | 312 void FakeModelTypeService::SetConflictResolution( |
| 315 ConflictResolution resolution) { | 313 ConflictResolution resolution) { |
| 316 conflict_resolution_.reset(new ConflictResolution(std::move(resolution))); | 314 conflict_resolution_.reset(new ConflictResolution(std::move(resolution))); |
| 317 } | 315 } |
| 318 | 316 |
| 319 void FakeModelTypeService::CheckPostConditions() { | 317 void FakeModelTypeService::CheckPostConditions() { |
| 320 DCHECK(!service_error_.IsSet()); | 318 DCHECK(!service_error_.IsSet()); |
| 321 } | 319 } |
| 322 | 320 |
| 323 } // namespace syncer_v2 | 321 } // namespace syncer_v2 |
| OLD | NEW |