diff options
| author | Dan Colish <colish@google.com> | 2015-12-14 11:06:15 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-12-14 11:06:15 -0800 |
| commit | e0affa61fcf906611bf8332a392f72845eb9424b (patch) | |
| tree | 4c39ee7005d4a825cc91c2a49a7a0f113d2d0c26 | |
| parent | 3f18bbbc96f466b3e6725ea0e05de7e5f7458c2d (diff) | |
| parent | 9f6fb89c67950128c98e723fad5263369f103faf (diff) | |
| download | dbus-binding-generator-e0affa61fcf906611bf8332a392f72845eb9424b.tar.gz | |
Match SetPropertyChangedCallback signature in mocked object.
am: 9f6fb89c67
* commit '9f6fb89c67950128c98e723fad5263369f103faf':
Match SetPropertyChangedCallback signature in mocked object.
| -rw-r--r-- | chromeos-dbus-bindings/proxy_generator.cc | 2 | ||||
| -rw-r--r-- | chromeos-dbus-bindings/proxy_generator_mock_unittest.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chromeos-dbus-bindings/proxy_generator.cc b/chromeos-dbus-bindings/proxy_generator.cc index 3a9cce1..55c9eee 100644 --- a/chromeos-dbus-bindings/proxy_generator.cc +++ b/chromeos-dbus-bindings/proxy_generator.cc @@ -353,7 +353,7 @@ void ProxyGenerator::GenerateInterfaceMock(const ServiceConfig& config, "MOCK_CONST_METHOD0(GetObjectPath, const dbus::ObjectPath&());"); if (!config.object_manager.name.empty() && !interface.properties.empty()) { text->AddLineAndPushOffsetTo( - "MOCK_CONST_METHOD1(SetPropertyChangedCallback,", 1, '('); + "MOCK_METHOD1(SetPropertyChangedCallback,", 1, '('); text->AddLine(StringPrintf( "void(const base::Callback<void(%sInterface*, const std::string&)>&));", proxy_name.c_str())); diff --git a/chromeos-dbus-bindings/proxy_generator_mock_unittest.cc b/chromeos-dbus-bindings/proxy_generator_mock_unittest.cc index 6ba24ca..c71d1b0 100644 --- a/chromeos-dbus-bindings/proxy_generator_mock_unittest.cc +++ b/chromeos-dbus-bindings/proxy_generator_mock_unittest.cc @@ -152,8 +152,8 @@ class TestInterface2ProxyMock : public TestInterface2ProxyInterface { MOCK_CONST_METHOD0(name, const std::string&()); MOCK_METHOD2(set_name, void(const std::string&, const base::Callback<bool>&)); MOCK_CONST_METHOD0(GetObjectPath, const dbus::ObjectPath&()); - MOCK_CONST_METHOD1(SetPropertyChangedCallback, - void(const base::Callback<void(TestInterface2ProxyInterface*, const std::string&)>&)); + MOCK_METHOD1(SetPropertyChangedCallback, + void(const base::Callback<void(TestInterface2ProxyInterface*, const std::string&)>&)); private: DISALLOW_COPY_AND_ASSIGN(TestInterface2ProxyMock); |