| Index: chrome/browser/extensions/api/storage/settings_sync_unittest.cc
|
| diff --git a/chrome/browser/extensions/api/storage/settings_sync_unittest.cc b/chrome/browser/extensions/api/storage/settings_sync_unittest.cc
|
| index fcfcdc860a6eca38654b2f42ad0902779087be6a..0e7f496148759a0001490df93758b3be0e0285b8 100644
|
| --- a/chrome/browser/extensions/api/storage/settings_sync_unittest.cc
|
| +++ b/chrome/browser/extensions/api/storage/settings_sync_unittest.cc
|
| @@ -201,12 +201,12 @@ class TestingValueStoreFactory : public SettingsStorageFactory {
|
| class ExtensionSettingsSyncTest : public testing::Test {
|
| public:
|
| ExtensionSettingsSyncTest()
|
| - : ui_thread_(BrowserThread::UI, MessageLoop::current()),
|
| - file_thread_(BrowserThread::FILE, MessageLoop::current()),
|
| + : ui_thread_(BrowserThread::UI, base::MessageLoop::current()),
|
| + file_thread_(BrowserThread::FILE, base::MessageLoop::current()),
|
| storage_factory_(new util::ScopedSettingsStorageFactory()),
|
| sync_processor_(new MockSyncChangeProcessor),
|
| - sync_processor_delegate_(new SyncChangeProcessorDelegate(
|
| - sync_processor_.get())) {}
|
| + sync_processor_delegate_(
|
| + new SyncChangeProcessorDelegate(sync_processor_.get())) {}
|
|
|
| virtual void SetUp() OVERRIDE {
|
| ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
|
| @@ -237,7 +237,7 @@ class ExtensionSettingsSyncTest : public testing::Test {
|
|
|
| // Gets the syncer::SyncableService for the given sync type.
|
| syncer::SyncableService* GetSyncableService(syncer::ModelType model_type) {
|
| - MessageLoop::current()->RunUntilIdle();
|
| + base::MessageLoop::current()->RunUntilIdle();
|
| return frontend_->GetBackendForSync(model_type);
|
| }
|
|
|
| @@ -257,7 +257,7 @@ class ExtensionSettingsSyncTest : public testing::Test {
|
| }
|
|
|
| // Need these so that the DCHECKs for running on FILE or UI threads pass.
|
| - MessageLoop message_loop_;
|
| + base::MessageLoop message_loop_;
|
| content::TestBrowserThread ui_thread_;
|
| content::TestBrowserThread file_thread_;
|
|
|
|
|