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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/test/ash_test_helper.cc

Issue 477663004: Merged FakedDBusThreadManager with DBusThreadManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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
« ash/display/projecting_observer_chromeos_unittest.cc ('K') | « ash/system/chromeos/power/power_status_unittest.cc ('k') | athena/test/athena_test_helper.cc » ('j') | chrome/browser/metrics/chromeos_metrics_provider_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/ash_test_helper.cc
diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc
index b9f8ece934864e6340c1f0086ae756bbca18b6d8..86a50d5399736d6253fc5f22321da35f9ced4e27 100644
--- a/ash/test/ash_test_helper.cc
+++ b/ash/test/ash_test_helper.cc
@@ -81,7 +81,7 @@ void AshTestHelper::SetUp(bool start_session) {
#if defined(OS_CHROMEOS)
// Create DBusThreadManager for testing.
if (!chromeos::DBusThreadManager::IsInitialized()) {
- chromeos::DBusThreadManager::InitializeWithStub();
+ chromeos::DBusThreadManager::Initialize();
dbus_thread_manager_initialized_ = true;
}
// Create CrasAudioHandler for testing since g_browser_process is not
« ash/display/projecting_observer_chromeos_unittest.cc ('K') | « ash/system/chromeos/power/power_status_unittest.cc ('k') | athena/test/athena_test_helper.cc » ('j') | chrome/browser/metrics/chromeos_metrics_provider_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698