test: Replace the C++ MOCK_METHOD<n> macros with the new MOCK_METHOD

Change-Id: I1667c6edd37447dbb6e868e853eb5ac05f348f89
Signed-off-by: Willy Tu <wltu@google.com>
diff --git a/test/dlsys_mock.hpp b/test/dlsys_mock.hpp
index 795b40e..8c2cf21 100644
--- a/test/dlsys_mock.hpp
+++ b/test/dlsys_mock.hpp
@@ -14,9 +14,9 @@
   public:
     virtual ~InternalDlSysMock() = default;
 
-    MOCK_CONST_METHOD0(dlerror, const char*());
-    MOCK_CONST_METHOD2(dlopen, void*(const char*, int));
-    MOCK_CONST_METHOD2(dlsym, void*(void*, const char*));
+    MOCK_METHOD(const char*, dlerror, (), (const, override));
+    MOCK_METHOD(void*, dlopen, (const char*, int), (const, override));
+    MOCK_METHOD(void*, dlsym, (void*, const char*), (const, override));
 };
 
 } // namespace internal