Replace the C++ MOCK_METHOD<n> family of macros with the new MOCK_METHOD

Change-Id: I5373c5bad7a22f158425335a245ab90310e799f7
diff --git a/src/base/unix_socket_unittest.cc b/src/base/unix_socket_unittest.cc
index c902033..361c0a1 100644
--- a/src/base/unix_socket_unittest.cc
+++ b/src/base/unix_socket_unittest.cc
@@ -53,10 +53,10 @@
 
 class MockEventListener : public UnixSocket::EventListener {
  public:
-  MOCK_METHOD2(OnNewIncomingConnection, void(UnixSocket*, UnixSocket*));
-  MOCK_METHOD2(OnConnect, void(UnixSocket*, bool));
-  MOCK_METHOD1(OnDisconnect, void(UnixSocket*));
-  MOCK_METHOD1(OnDataAvailable, void(UnixSocket*));
+  MOCK_METHOD(void, OnNewIncomingConnection, (UnixSocket*, UnixSocket*));
+  MOCK_METHOD(void, OnConnect, (UnixSocket*, bool), (override));
+  MOCK_METHOD(void, OnDisconnect, (UnixSocket*), (override));
+  MOCK_METHOD(void, OnDataAvailable, (UnixSocket*), (override));
 
   // GMock doesn't support mocking methods with non-copiable args.
   void OnNewIncomingConnection(