chromeos/dbus/mock_dbus_thread_manager.cc - Issue 12564007: Hook up system clock update dbus signal to chrome and ash tray ui.

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 12564007: Hook up system clock update dbus signal to chrome and ash tray ui. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix browser_tests by adding MockSystemClockClient. Created 7 years, 9 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 | « chromeos/dbus/mock_dbus_thread_manager.h ('k') | chromeos/dbus/mock_dbus_thread_manager_without_gmock.h » ('j') | chromeos/dbus/system_clock_client.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 e269fd5bae70055c04fa604fbe0514d57c2c946f..59f90ed58a2d0a08e9f674d7266e21492157fa22 100644

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

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

@@ -27,6 +27,7 @@

#include "chromeos/dbus/mock_power_manager_client.h"

#include "chromeos/dbus/mock_session_manager_client.h"

#include "chromeos/dbus/mock_sms_client.h"

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

#include "chromeos/dbus/mock_update_engine_client.h"

#include "chromeos/dbus/power_policy_controller.h"

@@ -60,6 +61,7 @@ MockDBusThreadManager::MockDBusThreadManager()

mock_power_manager_client_(new MockPowerManagerClient),

mock_session_manager_client_(new MockSessionManagerClient),

mock_sms_client_(new MockSMSClient),

+ mock_system_clock_client_(new MockSystemClockClient),

mock_update_engine_client_(new MockUpdateEngineClient) {

EXPECT_CALL(*this, GetBluetoothAdapterClient())

.WillRepeatedly(Return(mock_bluetooth_adapter_client_.get()));

@@ -103,6 +105,8 @@ MockDBusThreadManager::MockDBusThreadManager()

.WillRepeatedly(Return(mock_session_manager_client_.get()));

EXPECT_CALL(*this, GetSMSClient())

.WillRepeatedly(Return(mock_sms_client_.get()));

+ EXPECT_CALL(*this, GetSystemClockClient())

+ .WillRepeatedly(Return(mock_system_clock_client()));

EXPECT_CALL(*this, GetUpdateEngineClient())

.WillRepeatedly(Return(mock_update_engine_client_.get()));

EXPECT_CALL(*this, GetIBusInputContextClient())

@@ -141,6 +145,12 @@ MockDBusThreadManager::MockDBusThreadManager()

.Times(AnyNumber());

EXPECT_CALL(*mock_update_engine_client_.get(), AddObserver(_))

.Times(AnyNumber());

+ EXPECT_CALL(*mock_system_clock_client_.get(), AddObserver(_))

+ .Times(AnyNumber());

+ EXPECT_CALL(*mock_system_clock_client_.get(), RemoveObserver(_))

+ .Times(AnyNumber());

+ EXPECT_CALL(*mock_system_clock_client_.get(), HasObserver(_))

+ .Times(AnyNumber());

EXPECT_CALL(*mock_update_engine_client_.get(), RemoveObserver(_))

.Times(AnyNumber());

EXPECT_CALL(*mock_bluetooth_manager_client_.get(), AddObserver(_))

« no previous file with comments | « chromeos/dbus/mock_dbus_thread_manager.h ('k') | chromeos/dbus/mock_dbus_thread_manager_without_gmock.h » ('j') | chromeos/dbus/system_clock_client.cc » ('J')