chromeos/dbus/mock_dbus_thread_manager.cc - Issue 11887008: Deprecate ShillNetworkClient and add GeolocationHandler

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/mock_dbus_thread_manager.cc

Issue 11887008: Deprecate ShillNetworkClient and add GeolocationHandler (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix unittest Created 7 years, 11 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/mock_dbus_thread_manager.cc

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

index e2a5b0dcb55f1adce3ec6c3f74ceabdcab5151f9..f622526ed0a1814fd5bc40acb1a7934e10f8508e 100644

--- a/chromeos/dbus/mock_dbus_thread_manager.cc

+++ b/chromeos/dbus/mock_dbus_thread_manager.cc

@@ -17,7 +17,6 @@

#include "chromeos/dbus/mock_shill_device_client.h"

#include "chromeos/dbus/mock_shill_ipconfig_client.h"

#include "chromeos/dbus/mock_shill_manager_client.h"

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

#include "chromeos/dbus/mock_shill_profile_client.h"

#include "chromeos/dbus/mock_shill_service_client.h"

#include "chromeos/dbus/mock_gsm_sms_client.h"

@@ -52,7 +51,6 @@ MockDBusThreadManager::MockDBusThreadManager()

mock_shill_device_client_(new MockShillDeviceClient),

mock_shill_ipconfig_client_(new MockShillIPConfigClient),

mock_shill_manager_client_(new MockShillManagerClient),

- mock_shill_network_client_(new MockShillNetworkClient),

mock_shill_profile_client_(new MockShillProfileClient),

mock_shill_service_client_(new MockShillServiceClient),

mock_gsm_sms_client_(new MockGsmSMSClient),

@@ -90,8 +88,6 @@ MockDBusThreadManager::MockDBusThreadManager()

.WillRepeatedly(Return(mock_shill_ipconfig_client()));

EXPECT_CALL(*this, GetShillManagerClient())

.WillRepeatedly(Return(mock_shill_manager_client()));

- EXPECT_CALL(*this, GetShillNetworkClient())

- .WillRepeatedly(Return(mock_shill_network_client()));

EXPECT_CALL(*this, GetShillProfileClient())

.WillRepeatedly(Return(mock_shill_profile_client()));

EXPECT_CALL(*this, GetShillServiceClient())