| 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 903ede8d42da6b9fb36328102acc88bcbacee691..1737d68b09337e0334ebc0001201f0590fc29c98 100644
|
| --- a/chrome/browser/extensions/api/storage/settings_sync_unittest.cc
|
| +++ b/chrome/browser/extensions/api/storage/settings_sync_unittest.cc
|
| @@ -7,7 +7,7 @@
|
| #include "base/json/json_reader.h"
|
| #include "base/json/json_writer.h"
|
| #include "base/memory/scoped_ptr.h"
|
| -#include "base/message_loop/message_loop.h"
|
| +#include "base/run_loop.h"
|
| #include "chrome/browser/extensions/api/storage/leveldb_settings_storage_factory.h"
|
| #include "chrome/browser/extensions/api/storage/settings_frontend.h"
|
| #include "chrome/browser/extensions/api/storage/settings_storage_factory.h"
|
| @@ -18,7 +18,8 @@
|
| #include "chrome/browser/extensions/test_extension_service.h"
|
| #include "chrome/browser/value_store/testing_value_store.h"
|
| #include "chrome/common/extensions/manifest.h"
|
| -#include "content/public/test/test_browser_thread.h"
|
| +#include "content/public/browser/browser_thread.h"
|
| +#include "content/public/test/test_browser_thread_bundle.h"
|
| #include "sync/api/sync_change_processor.h"
|
| #include "sync/api/sync_error_factory.h"
|
| #include "sync/api/sync_error_factory_mock.h"
|
| @@ -205,9 +206,7 @@ class TestingValueStoreFactory : public SettingsStorageFactory {
|
| class ExtensionSettingsSyncTest : public testing::Test {
|
| public:
|
| ExtensionSettingsSyncTest()
|
| - : ui_thread_(BrowserThread::UI, base::MessageLoop::current()),
|
| - file_thread_(BrowserThread::FILE, base::MessageLoop::current()),
|
| - storage_factory_(new util::ScopedSettingsStorageFactory()),
|
| + : storage_factory_(new util::ScopedSettingsStorageFactory()),
|
| sync_processor_(new MockSyncChangeProcessor),
|
| sync_processor_delegate_(new SyncChangeProcessorDelegate(
|
| sync_processor_.get())) {}
|
| @@ -224,7 +223,7 @@ class ExtensionSettingsSyncTest : public testing::Test {
|
| frontend_.reset();
|
| profile_.reset();
|
| // Execute any pending deletion tasks.
|
| - message_loop_.RunUntilIdle();
|
| + base::RunLoop().RunUntilIdle();
|
| }
|
|
|
| protected:
|
| @@ -261,9 +260,7 @@ class ExtensionSettingsSyncTest : public testing::Test {
|
| }
|
|
|
| // Need these so that the DCHECKs for running on FILE or UI threads pass.
|
| - base::MessageLoop message_loop_;
|
| - content::TestBrowserThread ui_thread_;
|
| - content::TestBrowserThread file_thread_;
|
| + content::TestBrowserThreadBundle thread_bundle_;
|
|
|
| base::ScopedTempDir temp_dir_;
|
| scoped_ptr<util::MockProfile> profile_;
|
|
|