Remove std::mem_fun uses.

chromeos/dbus/services/service_provider_test_helper.cc

Index: chromeos/dbus/services/service_provider_test_helper.cc
diff --git a/chromeos/dbus/services/service_provider_test_helper.cc b/chromeos/dbus/services/service_provider_test_helper.cc
index 7407946c1aea67f70df364da71011de99e590a1a..33f3d9d37e7d5be7cb2934125c04a788e84f87a2 100644
--- a/chromeos/dbus/services/service_provider_test_helper.cc
+++ b/chromeos/dbus/services/service_provider_test_helper.cc
@@ -61,15 +61,27 @@ void ServiceProviderTestHelper::SetUp(
                                 dbus::ObjectPath(kLibCrosServicePath));
   // |mock_object_proxy_|'s MockCallMethodAndBlock() will use
   // MockCallMethodAndBlock() to return responses.
+  struct InterfaceGetter {
+    using result_type = std::string;
+    std::string operator()(dbus::MethodCall* method_call) {
+      return method_call->GetInterface();
+    }
+  };

[Nico, 2016/03/10 22:23:19]

I love all the other changes in this CL, but this one seems bad:

1. It's more code

2. The use of mem_fun is very hidden somewhere in gmock here. Can we change this
in gmock instead? (We've made changes to gmock in the past, it's doable.)

Maybe you can revert the change to this file for now for landing?

[vmpstr, 2016/03/10 22:45:00]

I figured that it's probably OK since this is test code :P but yes, I agree that
we should probably change gmock. Jeffrey also suggested something similar on the
discussion thread.
That sounds good. Done.

+
+  struct MemberGetter {
+    using result_type = std::string;
+    std::string operator()(dbus::MethodCall* method_call) {
+      return method_call->GetMember();
+    }
+  };
+
   EXPECT_CALL(*mock_object_proxy_.get(),
               MockCallMethodAndBlock(
-                  AllOf(ResultOf(std::mem_fun(&dbus::MethodCall::GetInterface),
-                                 kLibCrosServiceInterface),
-                        ResultOf(std::mem_fun(&dbus::MethodCall::GetMember),
-                                 exported_method_name)),
+                  AllOf(ResultOf(InterfaceGetter(), kLibCrosServiceInterface),
+                        ResultOf(MemberGetter(), exported_method_name)),
                   _))
       .WillOnce(
-           Invoke(this, &ServiceProviderTestHelper::MockCallMethodAndBlock));
+          Invoke(this, &ServiceProviderTestHelper::MockCallMethodAndBlock));
 
   service_provider->Start(mock_exported_object_.get());
 }