chrome/browser/chromeos/cros/cros_network_functions_unittest.cc - Issue 10854121: Fixes for handling of MockDBusThreadManager::GetSystemBus().

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/cros/cros_network_functions_unittest.cc

Issue 10854121: Fixes for handling of MockDBusThreadManager::GetSystemBus(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix the build for sure Created 8 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: chrome/browser/chromeos/cros/cros_network_functions_unittest.cc

diff --git a/chrome/browser/chromeos/cros/cros_network_functions_unittest.cc b/chrome/browser/chromeos/cros/cros_network_functions_unittest.cc

index a2bc6524982a46896dbf85d6dcec37995c6984d9..811e955f91a5ac888a04108f4be9a44817279824 100644

--- a/chrome/browser/chromeos/cros/cros_network_functions_unittest.cc

+++ b/chrome/browser/chromeos/cros/cros_network_functions_unittest.cc

@@ -155,6 +155,8 @@ class CrosNetworkFunctionsTest : public testing::Test {

virtual void SetUp() {

MockDBusThreadManager* mock_dbus_thread_manager = new MockDBusThreadManager;

+ EXPECT_CALL(*mock_dbus_thread_manager, GetSystemBus())

+ .WillRepeatedly(Return(reinterpret_cast<dbus::Bus*>(NULL)));

DBusThreadManager::InitializeForTesting(mock_dbus_thread_manager);

mock_cashew_client_ = mock_dbus_thread_manager->mock_cashew_client();

mock_device_client_ =