commit 9f6fb89c67950128c98e723fad5263369f103faf
author Dan Colish <colish@google.com> Mon Dec 14 10:29:00 2015 -0800
committer Dan Colish <colish@google.com> Mon Dec 14 10:30:40 2015 -0800
tree 4c39ee7005d4a825cc91c2a49a7a0f113d2d0c26
parent e4ba481e55e2b0e1cb1fa528005bcfc3da361424

Match SetPropertyChangedCallback signature in mocked object.

BUG: 26092352
Change-Id: Iba1e8cac5707daaf7b09c38af60b46852662c151

chromeos-dbus-bindings/proxy_generator.cc

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 @@
       "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()));

chromeos-dbus-bindings/proxy_generator_mock_unittest.cc

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 @@
   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);