Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(141)

Side by Side Diff: components/sync/driver/ui_data_type_controller_unittest.cc

Issue 2401223002: [Sync] Renaming sync/api* to sync/model*. (Closed)
Patch Set: Missed a comment in a DEPS file, and rebasing. Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « components/sync/driver/ui_data_type_controller.cc ('k') | components/sync/engine/DEPS » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/ui_data_type_controller.h" 5 #include "components/sync/driver/ui_data_type_controller.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/location.h" 10 #include "base/location.h"
11 #include "base/message_loop/message_loop.h" 11 #include "base/message_loop/message_loop.h"
12 #include "base/run_loop.h" 12 #include "base/run_loop.h"
13 #include "base/single_thread_task_runner.h" 13 #include "base/single_thread_task_runner.h"
14 #include "base/threading/thread_task_runner_handle.h" 14 #include "base/threading/thread_task_runner_handle.h"
15 #include "base/tracked_objects.h" 15 #include "base/tracked_objects.h"
16 #include "components/sync/api/fake_syncable_service.h"
17 #include "components/sync/base/model_type.h" 16 #include "components/sync/base/model_type.h"
18 #include "components/sync/driver/data_type_controller_mock.h" 17 #include "components/sync/driver/data_type_controller_mock.h"
19 #include "components/sync/driver/fake_generic_change_processor.h" 18 #include "components/sync/driver/fake_generic_change_processor.h"
20 #include "components/sync/driver/fake_sync_client.h" 19 #include "components/sync/driver/fake_sync_client.h"
20 #include "components/sync/model/fake_syncable_service.h"
21 #include "testing/gtest/include/gtest/gtest.h" 21 #include "testing/gtest/include/gtest/gtest.h"
22 22
23 using testing::_; 23 using testing::_;
24 using testing::Invoke; 24 using testing::Invoke;
25 using testing::InvokeWithoutArgs; 25 using testing::InvokeWithoutArgs;
26 using testing::Return; 26 using testing::Return;
27 27
28 namespace syncer { 28 namespace syncer {
29 namespace { 29 namespace {
30 30
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 203
204 testing::Mock::VerifyAndClearExpectations(&start_callback_); 204 testing::Mock::VerifyAndClearExpectations(&start_callback_);
205 EXPECT_CALL(model_load_callback_, Run(_, _)); 205 EXPECT_CALL(model_load_callback_, Run(_, _));
206 SyncError error(FROM_HERE, SyncError::DATATYPE_ERROR, "error", PREFERENCES); 206 SyncError error(FROM_HERE, SyncError::DATATYPE_ERROR, "error", PREFERENCES);
207 preference_dtc_->OnUnrecoverableError(error); 207 preference_dtc_->OnUnrecoverableError(error);
208 PumpLoop(); 208 PumpLoop();
209 } 209 }
210 210
211 } // namespace 211 } // namespace
212 } // namespace syncer 212 } // namespace syncer
OLDNEW
« no previous file with comments | « components/sync/driver/ui_data_type_controller.cc ('k') | components/sync/engine/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698