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

Side by Side Diff: components/sync/core_impl/model_type_connector_proxy_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/core_impl/DEPS ('k') | components/sync/device_info/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/core_impl/model_type_connector_proxy.h" 5 #include "components/sync/core_impl/model_type_connector_proxy.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"
11 #include "base/memory/ptr_util.h" 11 #include "base/memory/ptr_util.h"
12 #include "base/message_loop/message_loop.h" 12 #include "base/message_loop/message_loop.h"
13 #include "base/run_loop.h" 13 #include "base/run_loop.h"
14 #include "base/threading/thread_task_runner_handle.h" 14 #include "base/threading/thread_task_runner_handle.h"
15 #include "components/sync/api/data_type_error_handler_mock.h"
16 #include "components/sync/api/stub_model_type_service.h"
17 #include "components/sync/core/activation_context.h" 15 #include "components/sync/core/activation_context.h"
18 #include "components/sync/core/shared_model_type_processor.h" 16 #include "components/sync/core/shared_model_type_processor.h"
19 #include "components/sync/engine_impl/model_type_registry.h" 17 #include "components/sync/engine_impl/model_type_registry.h"
18 #include "components/sync/model/data_type_error_handler_mock.h"
19 #include "components/sync/model/stub_model_type_service.h"
20 #include "components/sync/test/engine/mock_nudge_handler.h" 20 #include "components/sync/test/engine/mock_nudge_handler.h"
21 #include "components/sync/test/engine/test_directory_setter_upper.h" 21 #include "components/sync/test/engine/test_directory_setter_upper.h"
22 #include "testing/gtest/include/gtest/gtest.h" 22 #include "testing/gtest/include/gtest/gtest.h"
23 23
24 namespace syncer { 24 namespace syncer {
25 25
26 class ModelTypeConnectorProxyTest : public ::testing::Test, 26 class ModelTypeConnectorProxyTest : public ::testing::Test,
27 StubModelTypeService { 27 StubModelTypeService {
28 public: 28 public:
29 ModelTypeConnectorProxyTest() 29 ModelTypeConnectorProxyTest()
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 OnSyncStarting(processor.get()); 124 OnSyncStarting(processor.get());
125 125
126 base::RunLoop run_loop_; 126 base::RunLoop run_loop_;
127 run_loop_.RunUntilIdle(); 127 run_loop_.RunUntilIdle();
128 128
129 EXPECT_TRUE(processor->IsConnected()); 129 EXPECT_TRUE(processor->IsConnected());
130 DisableSync(); 130 DisableSync();
131 } 131 }
132 132
133 } // namespace syncer 133 } // namespace syncer
OLDNEW
« no previous file with comments | « components/sync/core_impl/DEPS ('k') | components/sync/device_info/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698