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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/login/wizard_controller_browsertest.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
« no previous file with comments | « chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc ('k') | chrome/browser/chromeos/mobile/mobile_activator_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/wizard_controller_browsertest.cc
diff --git a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
index 2e265212620c219d0a53dec892b006c95f9ae150..a461e88cb8317d902dcc01743ebde12dfc9a69cc 100644
--- a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
+++ b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
@@ -53,7 +53,6 @@
#include "chromeos/chromeos_switches.h"
#include "chromeos/chromeos_test_utils.h"
#include "chromeos/dbus/dbus_thread_manager.h"
-#include "chromeos/dbus/fake_dbus_thread_manager.h"
#include "chromeos/dbus/fake_session_manager_client.h"
#include "chromeos/login/auth/key.h"
#include "chromeos/login/auth/mock_auth_status_consumer.h"
@@ -799,13 +798,9 @@ class WizardControllerBrokenLocalStateTest : public WizardControllerTest {
virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
WizardControllerTest::SetUpInProcessBrowserTestFixture();
- FakeDBusThreadManager* fake_dbus_thread_manager =
- new FakeDBusThreadManager();
- fake_dbus_thread_manager->SetFakeClients();
fake_session_manager_client_ = new FakeSessionManagerClient;
- fake_dbus_thread_manager->SetSessionManagerClient(
+ DBusThreadManager::GetSetterForTesting()->SetSessionManagerClient(
scoped_ptr<SessionManagerClient>(fake_session_manager_client_));
- DBusThreadManager::SetInstanceForTesting(fake_dbus_thread_manager);
}
virtual void SetUpOnMainThread() OVERRIDE {
« no previous file with comments | « chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc ('k') | chrome/browser/chromeos/mobile/mobile_activator_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698