| Index: components/sync/driver/ui_model_type_controller_unittest.cc
|
| diff --git a/components/sync_driver/ui_model_type_controller_unittest.cc b/components/sync/driver/ui_model_type_controller_unittest.cc
|
| similarity index 97%
|
| rename from components/sync_driver/ui_model_type_controller_unittest.cc
|
| rename to components/sync/driver/ui_model_type_controller_unittest.cc
|
| index 08e19f109ba4c31ecdcaa27725f90af6f26d9647..2a7668f7de8d5437a7137c5ba87f4323b4a42f21 100644
|
| --- a/components/sync_driver/ui_model_type_controller_unittest.cc
|
| +++ b/components/sync/driver/ui_model_type_controller_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 "components/sync_driver/ui_model_type_controller.h"
|
| +#include "components/sync/driver/ui_model_type_controller.h"
|
|
|
| #include "base/bind.h"
|
| #include "base/callback.h"
|
| @@ -18,9 +18,9 @@
|
| #include "components/sync/api/fake_model_type_service.h"
|
| #include "components/sync/core/activation_context.h"
|
| #include "components/sync/core/shared_model_type_processor.h"
|
| +#include "components/sync/driver/backend_data_type_configurer.h"
|
| +#include "components/sync/driver/fake_sync_client.h"
|
| #include "components/sync/engine_impl/commit_queue.h"
|
| -#include "components/sync_driver/backend_data_type_configurer.h"
|
| -#include "components/sync_driver/fake_sync_client.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| namespace sync_driver_v2 {
|
| @@ -211,9 +211,7 @@ class UIModelTypeControllerTest : public testing::Test,
|
| }
|
|
|
| // These threads can ping-pong for a bit so we run the UI thread twice.
|
| - void RunAllTasks() {
|
| - base::RunLoop().RunUntilIdle();
|
| - }
|
| + void RunAllTasks() { base::RunLoop().RunUntilIdle(); }
|
|
|
| void SetAutoRunTasks(bool auto_run_tasks) {
|
| auto_run_tasks_ = auto_run_tasks;
|
|
|