Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(929)

Unified Diff: chrome/browser/extensions/api/storage/settings_sync_unittest.cc

Issue 12546016: Remove the Extensions URLRequestContext (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: android webview init fix merged in. Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 0480062c8eda93a738745c34693791c1ee2feee2..55870e4b8ade49040156f6855462387b5af7bc34 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"
@@ -17,7 +17,7 @@
#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/extensions/test_extension_service.h"
#include "chrome/browser/value_store/testing_value_store.h"
-#include "content/public/test/test_browser_thread.h"
+#include "content/public/test/test_browser_thread_bundle.h"
#include "extensions/common/manifest.h"
#include "sync/api/sync_change_processor.h"
#include "sync/api/sync_error_factory.h"
@@ -27,7 +27,6 @@
using base::DictionaryValue;
using base::ListValue;
using base::Value;
-using content::BrowserThread;
namespace extensions {
@@ -205,9 +204,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 +221,7 @@ class ExtensionSettingsSyncTest : public testing::Test {
frontend_.reset();
profile_.reset();
// Execute any pending deletion tasks.
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
}
protected:
@@ -261,9 +258,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_;
« no previous file with comments | « chrome/browser/extensions/api/storage/settings_frontend_unittest.cc ('k') | chrome/browser/extensions/data_deleter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698