Remove std::mem_fun uses.

chromeos/dbus/services/service_provider_test_helper.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/dbus/services/service_provider_test_helper.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "dbus/message.h"
@@ skipping 43 matching lines @@
       .WillOnce(Invoke(this, &ServiceProviderTestHelper::MockExportMethod));
 
   // Create a mock object proxy, with which we call a method of
   // |mock_exported_object_|.
   mock_object_proxy_ =
       new dbus::MockObjectProxy(mock_bus_.get(),
                                 kLibCrosServiceName,
                                 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());
 }
 
 void ServiceProviderTestHelper::TearDown() {
   mock_bus_->ShutdownAndBlock();
   mock_exported_object_ = NULL;
   mock_object_proxy_ = NULL;
   mock_bus_ = NULL;
 }
@@ skipping 74 matching lines @@
 
 void ServiceProviderTestHelper::OnResponse(
     scoped_ptr<dbus::Response> response) {
   response_ = std::move(response);
   response_received_ = true;
   if (base::MessageLoop::current()->is_running())
     base::MessageLoop::current()->QuitWhenIdle();
 }
 
 }  // namespace chromeos