1*635a8641SAndroid Build Coastguard WorkerFrom eadafb5815145a401cbfa6da559de01cb35d3a2b Mon Sep 17 00:00:00 2001 2*635a8641SAndroid Build Coastguard WorkerFrom: Qijiang Fan <[email protected]> 3*635a8641SAndroid Build Coastguard WorkerDate: Tue, 17 Dec 2019 17:21:54 +0900 4*635a8641SAndroid Build Coastguard WorkerSubject: [PATCH 3/5] mock object proxy WaitForServiceToBeAvailable 5*635a8641SAndroid Build Coastguard Worker 6*635a8641SAndroid Build Coastguard WorkerChange-Id: I01d2e49547f0e9083df60de69ef254761de2c00e 7*635a8641SAndroid Build Coastguard Worker--- 8*635a8641SAndroid Build Coastguard Worker dbus/mock_object_proxy.cc | 5 +++++ 9*635a8641SAndroid Build Coastguard Worker dbus/mock_object_proxy.h | 6 +++++++ 10*635a8641SAndroid Build Coastguard Worker 2 files changed, 11 insertions(+) 11*635a8641SAndroid Build Coastguard Worker 12*635a8641SAndroid Build Coastguard Workerdiff --git a/dbus/mock_object_proxy.cc b/dbus/mock_object_proxy.cc 13*635a8641SAndroid Build Coastguard Workerindex 4929486..a1f2edd 100644 14*635a8641SAndroid Build Coastguard Worker--- a/dbus/mock_object_proxy.cc 15*635a8641SAndroid Build Coastguard Worker+++ b/dbus/mock_object_proxy.cc 16*635a8641SAndroid Build Coastguard Worker@@ -45,4 +45,9 @@ void MockObjectProxy::ConnectToSignal( 17*635a8641SAndroid Build Coastguard Worker &on_connected_callback); 18*635a8641SAndroid Build Coastguard Worker } 19*635a8641SAndroid Build Coastguard Worker 20*635a8641SAndroid Build Coastguard Worker+void MockObjectProxy::WaitForServiceToBeAvailable( 21*635a8641SAndroid Build Coastguard Worker+ WaitForServiceToBeAvailableCallback callback) { 22*635a8641SAndroid Build Coastguard Worker+ DoWaitForServiceToBeAvailable(&callback); 23*635a8641SAndroid Build Coastguard Worker+} 24*635a8641SAndroid Build Coastguard Worker+ 25*635a8641SAndroid Build Coastguard Worker } // namespace dbus 26*635a8641SAndroid Build Coastguard Workerdiff --git a/dbus/mock_object_proxy.h b/dbus/mock_object_proxy.h 27*635a8641SAndroid Build Coastguard Workerindex 7bc2376..abc793a 100644 28*635a8641SAndroid Build Coastguard Worker--- a/dbus/mock_object_proxy.h 29*635a8641SAndroid Build Coastguard Worker+++ b/dbus/mock_object_proxy.h 30*635a8641SAndroid Build Coastguard Worker@@ -89,6 +90,12 @@ class MockObjectProxy : public ObjectProxy { 31*635a8641SAndroid Build Coastguard Worker OnConnectedCallback* on_connected_callback)); 32*635a8641SAndroid Build Coastguard Worker MOCK_METHOD1(SetNameOwnerChangedCallback, 33*635a8641SAndroid Build Coastguard Worker void(NameOwnerChangedCallback callback)); 34*635a8641SAndroid Build Coastguard Worker+ // This method is not mockable because it takes a move-only argument. To work 35*635a8641SAndroid Build Coastguard Worker+ // around this. WaitForServiceToBeAvailable implements here calls 36*635a8641SAndroid Build Coastguard Worker+ // DoWaitForServiceToBeAvailable which is mockable. 37*635a8641SAndroid Build Coastguard Worker+ void WaitForServiceToBeAvailable(WaitForServiceToBeAvailableCallback callback) override; 38*635a8641SAndroid Build Coastguard Worker+ MOCK_METHOD1(DoWaitForServiceToBeAvailable, 39*635a8641SAndroid Build Coastguard Worker+ void(WaitForServiceToBeAvailableCallback* callback)); 40*635a8641SAndroid Build Coastguard Worker MOCK_METHOD0(Detach, void()); 41*635a8641SAndroid Build Coastguard Worker 42*635a8641SAndroid Build Coastguard Worker protected: 43*635a8641SAndroid Build Coastguard Worker-- 44*635a8641SAndroid Build Coastguard Worker2.24.1.735.g03f4e72817-goog 45*635a8641SAndroid Build Coastguard Worker 46