chrome/browser/chromeos/login/screens/network_screen_browsertest.cc - Issue 477663004: Merged FakedDBusThreadManager with DBusThreadManager.

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 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/saml/saml_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 93640cb31a2590846faf72ba9a77b027c6460487..50007108b4513b445ce1ec161c57910f67deaad3 100644

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

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

@@ -10,7 +10,7 @@

#include "chrome/browser/chromeos/login/test/wizard_in_process_browser_test.h"

#include "chrome/browser/chromeos/login/wizard_controller.h"

#include "chrome/test/base/ui_test_utils.h"

-#include "chromeos/dbus/fake_dbus_thread_manager.h"

+#include "chromeos/dbus/dbus_thread_manager.h"

#include "chromeos/dbus/fake_session_manager_client.h"

#include "content/public/test/test_utils.h"

#include "testing/gmock/include/gmock/gmock.h"

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

virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {

WizardInProcessBrowserTest::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 {