chromeos/dbus/fake_shill_manager_client.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: chromeos/dbus/fake_shill_manager_client.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:

Index: chromeos/dbus/fake_shill_manager_client.cc

diff --git a/chromeos/dbus/fake_shill_manager_client.cc b/chromeos/dbus/fake_shill_manager_client.cc

index f524c1f7c0f62adbd73131c1d40a72cff7e771f8..7b4eb61f39c3f515d2c7cdb962a0c5ec2d86b00b 100644

--- a/chromeos/dbus/fake_shill_manager_client.cc

+++ b/chromeos/dbus/fake_shill_manager_client.cc

@@ -565,6 +565,11 @@ void FakeShillManagerClient::SetBestServiceToConnect(

}

void FakeShillManagerClient::SetupDefaultEnvironment() {

+ // Bail out from setup if there is no message loop. This will be the common

+ // case for tests that are not testing Shill.

+ if (!base::MessageLoop::current())

+ return;

DBusThreadManager* dbus_manager = DBusThreadManager::Get();

ShillServiceClient::TestInterface* services =

dbus_manager->GetShillServiceClient()->GetTestInterface();