| Index: components/sync_driver/model_association_manager_unittest.cc
|
| diff --git a/chrome/browser/sync/glue/model_association_manager_unittest.cc b/components/sync_driver/model_association_manager_unittest.cc
|
| similarity index 98%
|
| rename from chrome/browser/sync/glue/model_association_manager_unittest.cc
|
| rename to components/sync_driver/model_association_manager_unittest.cc
|
| index 6b9749581dd88aaee5003fac237c16561c4e7a18..5dc7274e49bdb285778799ab9ea2bfada330ed6a 100644
|
| --- a/chrome/browser/sync/glue/model_association_manager_unittest.cc
|
| +++ b/components/sync_driver/model_association_manager_unittest.cc
|
| @@ -4,9 +4,8 @@
|
|
|
| #include "base/callback.h"
|
| #include "base/message_loop/message_loop.h"
|
| -#include "chrome/browser/sync/glue/model_association_manager.h"
|
| #include "components/sync_driver/fake_data_type_controller.h"
|
| -#include "content/public/test/test_browser_thread.h"
|
| +#include "components/sync_driver/model_association_manager.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| @@ -58,13 +57,11 @@ ACTION_P(VerifyResult, expected_result) {
|
|
|
| class SyncModelAssociationManagerTest : public testing::Test {
|
| public:
|
| - SyncModelAssociationManagerTest() :
|
| - ui_thread_(content::BrowserThread::UI, &ui_loop_) {
|
| + SyncModelAssociationManagerTest() {
|
| }
|
|
|
| protected:
|
| base::MessageLoopForUI ui_loop_;
|
| - content::TestBrowserThread ui_thread_;
|
| MockModelAssociationResultProcessor result_processor_;
|
| DataTypeController::TypeMap controllers_;
|
| };
|
|
|