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

Unified Diff: chrome/browser/chromeos/login/screen_locker_browsertest.cc

Issue 49773003: ChromeOS: Remove MockDBusThreadManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed tests. Created 7 years, 1 month 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/chromeos/login/screen_locker_browsertest.cc
diff --git a/chrome/browser/chromeos/login/screen_locker_browsertest.cc b/chrome/browser/chromeos/login/screen_locker_browsertest.cc
index 0b3ad8bf202b433fa97e765421fabad06878260d..a441577dfd60ace910bee1cbb9d500799c832b9c 100644
--- a/chrome/browser/chromeos/login/screen_locker_browsertest.cc
+++ b/chrome/browser/chromeos/login/screen_locker_browsertest.cc
@@ -116,12 +116,14 @@ class ScreenLockerTest : public InProcessBrowserTest {
private:
virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
- FakeDBusThreadManager* fake_dbus_thread_manager =
- new FakeDBusThreadManager;
+ FakeDBusThreadManager* fake_dbus_thread_manager = new FakeDBusThreadManager;
+ fake_dbus_thread_manager->SetFakeClients();
+ fake_session_manager_client_ = new FakeSessionManagerClient;
+ fake_dbus_thread_manager->SetSessionManagerClient(
+ scoped_ptr<SessionManagerClient>(fake_session_manager_client_));
DBusThreadManager::InitializeForTesting(fake_dbus_thread_manager);
+
InProcessBrowserTest::SetUpInProcessBrowserTestFixture();
- fake_session_manager_client_ =
- fake_dbus_thread_manager->fake_session_manager_client();
zero_duration_mode_.reset(new ui::ScopedAnimationDurationScaleMode(
ui::ScopedAnimationDurationScaleMode::ZERO_DURATION));
}

Powered by Google App Engine
This is Rietveld 408576698