chrome/browser/chromeos/login/screens/network_screen_browsertest.cc - Issue 49773003: ChromeOS: Remove MockDBusThreadManager.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/login/screens/network_screen_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

« no previous file with comments | « chrome/browser/chromeos/login/screen_locker_browsertest.cc ('k') | chrome/browser/chromeos/login/screens/update_screen_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/screens/network_screen_browsertest.cc

diff --git a/chrome/browser/chromeos/login/screens/network_screen_browsertest.cc b/chrome/browser/chromeos/login/screens/network_screen_browsertest.cc

index 94af181b817c375457109af1e77098f4c1c05432..e06fc9f99ff7226e58c0cbbbb04f28aa9d1c60d7 100644

--- a/chrome/browser/chromeos/login/screens/network_screen_browsertest.cc

+++ b/chrome/browser/chromeos/login/screens/network_screen_browsertest.cc

@@ -53,11 +53,12 @@ class NetworkScreenTest : public WizardInProcessBrowserTest {

virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {

WizardInProcessBrowserTest::SetUpInProcessBrowserTestFixture();

- 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);

- fake_session_manager_client_ =

- fake_dbus_thread_manager->fake_session_manager_client();

}

virtual void SetUpOnMainThread() OVERRIDE {