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

Unified Diff: chrome/browser/chromeos/settings/device_settings_test_helper.cc

Issue 348713004: Use a TestBrowserThreadBundle in the DeviceSettingsTestBase. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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
« no previous file with comments | « chrome/browser/chromeos/settings/device_settings_test_helper.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/settings/device_settings_test_helper.cc
diff --git a/chrome/browser/chromeos/settings/device_settings_test_helper.cc b/chrome/browser/chromeos/settings/device_settings_test_helper.cc
index e089725e6d3c075bc1a8ffbd9e6e58047186e21d..8aa4311b516b21154937dd95ae42ad6b68248627 100644
--- a/chrome/browser/chromeos/settings/device_settings_test_helper.cc
+++ b/chrome/browser/chromeos/settings/device_settings_test_helper.cc
@@ -203,9 +203,7 @@ ScopedDeviceSettingsTestHelper::~ScopedDeviceSettingsTestHelper() {
}
DeviceSettingsTestBase::DeviceSettingsTestBase()
- : ui_thread_(content::BrowserThread::UI, &loop_),
- file_thread_(content::BrowserThread::FILE, &loop_),
- user_manager_(new FakeUserManager()),
+ : user_manager_(new FakeUserManager()),
user_manager_enabler_(user_manager_),
owner_key_util_(new MockOwnerKeyUtil()),
fake_dbus_thread_manager_(new FakeDBusThreadManager()) {
@@ -221,7 +219,7 @@ void DeviceSettingsTestBase::SetUp() {
chromeos::DBusThreadManager::InitializeForTesting(fake_dbus_thread_manager_);
NetworkHandler::Initialize();
- loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
device_policy_.payload().mutable_metrics_enabled()->set_metrics_enabled(
false);
« no previous file with comments | « chrome/browser/chromeos/settings/device_settings_test_helper.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698