OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/driver/async_directory_type_controller.h" | 5 #include "components/sync/driver/async_directory_type_controller.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
59 ACTION_P(SaveChangeProcessor, scoped_change_processor) { | 59 ACTION_P(SaveChangeProcessor, scoped_change_processor) { |
60 scoped_change_processor->reset(arg2); | 60 scoped_change_processor->reset(arg2); |
61 } | 61 } |
62 | 62 |
63 class SharedChangeProcessorMock : public SharedChangeProcessor { | 63 class SharedChangeProcessorMock : public SharedChangeProcessor { |
64 public: | 64 public: |
65 explicit SharedChangeProcessorMock(ModelType type) | 65 explicit SharedChangeProcessorMock(ModelType type) |
66 : SharedChangeProcessor(type) {} | 66 : SharedChangeProcessor(type) {} |
67 | 67 |
68 base::WeakPtr<SyncableService> Connect( | 68 base::WeakPtr<SyncableService> Connect( |
69 SyncClient*, | 69 const SyncClient::ServiceProvider&, |
| 70 SyncApiComponentFactory* driver_factory, |
70 GenericChangeProcessorFactory*, | 71 GenericChangeProcessorFactory*, |
71 UserShare*, | 72 UserShare*, |
72 std::unique_ptr<DataTypeErrorHandler>, | 73 std::unique_ptr<DataTypeErrorHandler>, |
73 const base::WeakPtr<SyncMergeResult>&) { | 74 const base::WeakPtr<SyncMergeResult>&) { |
74 return std::move(connect_return_); | 75 return std::move(connect_return_); |
75 } | 76 } |
76 MOCK_METHOD0(Disconnect, bool()); | 77 MOCK_METHOD0(Disconnect, bool()); |
77 MOCK_METHOD2(ProcessSyncChanges, | 78 MOCK_METHOD2(ProcessSyncChanges, |
78 SyncError(const tracked_objects::Location&, | 79 SyncError(const tracked_objects::Location&, |
79 const SyncChangeList&)); | 80 const SyncChangeList&)); |
(...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
473 backend_thread_.task_runner()->PostTask( | 474 backend_thread_.task_runner()->PostTask( |
474 FROM_HERE, | 475 FROM_HERE, |
475 base::Bind(&DataTypeErrorHandler::OnUnrecoverableError, | 476 base::Bind(&DataTypeErrorHandler::OnUnrecoverableError, |
476 base::Passed(non_ui_dtc_->CreateErrorHandler()), error)); | 477 base::Passed(non_ui_dtc_->CreateErrorHandler()), error)); |
477 WaitForDTC(); | 478 WaitForDTC(); |
478 } | 479 } |
479 | 480 |
480 } // namespace | 481 } // namespace |
481 | 482 |
482 } // namespace syncer | 483 } // namespace syncer |
OLD | NEW |