| Index: components/sync/sessions_impl/model_type_registry_unittest.cc
|
| diff --git a/sync/sessions/model_type_registry_unittest.cc b/components/sync/sessions_impl/model_type_registry_unittest.cc
|
| similarity index 91%
|
| rename from sync/sessions/model_type_registry_unittest.cc
|
| rename to components/sync/sessions_impl/model_type_registry_unittest.cc
|
| index 82ba8faabd88348217a0ece39f42f35a6c78fd15..8445feac56709e5a7584640a98e7b297ba6d6059 100644
|
| --- a/sync/sessions/model_type_registry_unittest.cc
|
| +++ b/components/sync/sessions_impl/model_type_registry_unittest.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "sync/sessions/model_type_registry.h"
|
| +#include "components/sync/sessions_impl/model_type_registry.h"
|
|
|
| #include <utility>
|
| #include <vector>
|
| @@ -10,16 +10,16 @@
|
| #include "base/deferred_sequenced_task_runner.h"
|
| #include "base/memory/ptr_util.h"
|
| #include "base/message_loop/message_loop.h"
|
| -#include "sync/internal_api/public/activation_context.h"
|
| -#include "sync/internal_api/public/base/model_type.h"
|
| -#include "sync/internal_api/public/test/fake_model_type_processor.h"
|
| -#include "sync/protocol/data_type_state.pb.h"
|
| -#include "sync/syncable/directory.h"
|
| -#include "sync/syncable/model_neutral_mutable_entry.h"
|
| -#include "sync/syncable/syncable_model_neutral_write_transaction.h"
|
| -#include "sync/test/engine/fake_model_worker.h"
|
| -#include "sync/test/engine/mock_nudge_handler.h"
|
| -#include "sync/test/engine/test_directory_setter_upper.h"
|
| +#include "components/sync/base/model_type.h"
|
| +#include "components/sync/core/activation_context.h"
|
| +#include "components/sync/core/test/fake_model_type_processor.h"
|
| +#include "components/sync/protocol/data_type_state.pb.h"
|
| +#include "components/sync/syncable/directory.h"
|
| +#include "components/sync/syncable/model_neutral_mutable_entry.h"
|
| +#include "components/sync/syncable/syncable_model_neutral_write_transaction.h"
|
| +#include "components/sync/test/engine/fake_model_worker.h"
|
| +#include "components/sync/test/engine/mock_nudge_handler.h"
|
| +#include "components/sync/test/engine/test_directory_setter_upper.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| namespace syncer {
|
| @@ -66,7 +66,7 @@ class ModelTypeRegistryTest : public ::testing::Test {
|
| base::MessageLoop message_loop_;
|
|
|
| TestDirectorySetterUpper dir_maker_;
|
| - std::vector<scoped_refptr<ModelSafeWorker> > workers_;
|
| + std::vector<scoped_refptr<ModelSafeWorker>> workers_;
|
| std::unique_ptr<ModelTypeRegistry> registry_;
|
| MockNudgeHandler mock_nudge_handler_;
|
| };
|
| @@ -77,10 +77,8 @@ void ModelTypeRegistryTest::SetUp() {
|
| dir_maker_.SetUp();
|
| scoped_refptr<ModelSafeWorker> passive_worker(
|
| new FakeModelWorker(GROUP_PASSIVE));
|
| - scoped_refptr<ModelSafeWorker> ui_worker(
|
| - new FakeModelWorker(GROUP_UI));
|
| - scoped_refptr<ModelSafeWorker> db_worker(
|
| - new FakeModelWorker(GROUP_DB));
|
| + scoped_refptr<ModelSafeWorker> ui_worker(new FakeModelWorker(GROUP_UI));
|
| + scoped_refptr<ModelSafeWorker> db_worker(new FakeModelWorker(GROUP_DB));
|
| workers_.push_back(passive_worker);
|
| workers_.push_back(ui_worker);
|
| workers_.push_back(db_worker);
|
|
|