| 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..fe2651da3c71c763cf86ed83dffbeee97a265582 100644
|
| --- a/chrome/browser/chromeos/login/screen_locker_browsertest.cc
|
| +++ b/chrome/browser/chromeos/login/screen_locker_browsertest.cc
|
| @@ -116,12 +116,13 @@ class ScreenLockerTest : public InProcessBrowserTest {
|
|
|
| private:
|
| virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
|
| - FakeDBusThreadManager* fake_dbus_thread_manager =
|
| - new FakeDBusThreadManager;
|
| + FakeDBusThreadManager* fake_dbus_thread_manager = new FakeDBusThreadManager;
|
| + 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));
|
| }
|
|
|