| Index: chrome/browser/sync/glue/non_ui_data_type_controller_unittest.cc
|
| diff --git a/chrome/browser/sync/glue/non_ui_data_type_controller_unittest.cc b/chrome/browser/sync/glue/non_ui_data_type_controller_unittest.cc
|
| index e20e7e868b74541373c46d66259aec0268594905..4ca65cf4579f072d2f91bb6b3f17d55a726ac11f 100644
|
| --- a/chrome/browser/sync/glue/non_ui_data_type_controller_unittest.cc
|
| +++ b/chrome/browser/sync/glue/non_ui_data_type_controller_unittest.cc
|
| @@ -18,7 +18,6 @@
|
| #include "chrome/browser/sync/glue/shared_change_processor_mock.h"
|
| #include "chrome/browser/sync/profile_sync_components_factory_mock.h"
|
| #include "chrome/browser/sync/profile_sync_service_mock.h"
|
| -#include "chrome/test/base/profile_mock.h"
|
| #include "content/public/test/test_browser_thread.h"
|
| #include "sync/api/fake_syncable_service.h"
|
| #include "sync/internal_api/public/engine/model_safe_worker.h"
|
| @@ -152,7 +151,7 @@ class SyncNonUIDataTypeControllerTest : public testing::Test {
|
| public:
|
| SyncNonUIDataTypeControllerTest()
|
| : ui_thread_(BrowserThread::UI, &message_loop_),
|
| - db_thread_(BrowserThread::DB) {}
|
| + db_thread_(BrowserThread::DB), service_(&profile_) {}
|
|
|
| virtual void SetUp() OVERRIDE {
|
| EXPECT_CALL(service_, GetUserShare()).WillRepeatedly(
|
| @@ -244,7 +243,7 @@ class SyncNonUIDataTypeControllerTest : public testing::Test {
|
| base::MessageLoopForUI message_loop_;
|
| content::TestBrowserThread ui_thread_;
|
| content::TestBrowserThread db_thread_;
|
| - ProfileMock profile_;
|
| + TestingProfile profile_;
|
| scoped_ptr<ProfileSyncComponentsFactoryMock> profile_sync_factory_;
|
| StrictMock<ProfileSyncServiceMock> service_;
|
| StartCallbackMock start_callback_;
|
|
|