Avoid to use the method pointer to Callback<>::Run on gmock tests

chrome/browser/download/download_ui_controller_unittest.cc

 // Copyright 2013 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 "chrome/browser/download/download_ui_controller.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "chrome/browser/download/download_history.h"
 #include "chrome/browser/download/download_service_factory.h"
 #include "chrome/browser/download/download_service_impl.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "components/history/core/browser/download_row.h"
 #include "content/public/test/mock_download_item.h"
 #include "content/public/test/mock_download_manager.h"
 #include "testing/gmock/include/gmock/gmock.h"
+#include "testing/gmock_mutant.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::MockDownloadItem;
 using content::MockDownloadManager;
 using history::HistoryService;
 using testing::AnyNumber;
 using testing::Assign;
+using testing::CreateFunctor;
 using testing::Return;
 using testing::ReturnRefOfCopy;
 using testing::SaveArg;
 using testing::_;
 
 namespace {
 
 // A DownloadUIController::Delegate that stores the DownloadItem* for the last
 // download that was sent to the UI.
 class TestDelegate : public DownloadUIController::Delegate {
@@ skipping 291 matching lines @@
     // DownloadHistory will immediately try to create a download using the info
     // we push through the query callback. When DownloadManager::CreateDownload
     // is called, we need to first invoke the OnDownloadCreated callback for
     // DownloadHistory before returning the DownloadItem since that's the
     // sequence of events expected by DownloadHistory.
     base::Closure history_on_created_callback =
         base::Bind(&content::DownloadManager::Observer::OnDownloadCreated,
                    base::Unretained(download_history_manager_observer()),
                    manager(),
                    item.get());
-    EXPECT_CALL(*manager(), MockCreateDownloadItem(_)).WillOnce(
-        testing::DoAll(testing::InvokeWithoutArgs(&history_on_created_callback,
-                                                  &base::Closure::Run),
-                       Return(item.get())));
+    EXPECT_CALL(*manager(), MockCreateDownloadItem(_))
+        .WillOnce(testing::DoAll(testing::InvokeWithoutArgs(CreateFunctor(
+                                     history_on_created_callback)),
+                                 Return(item.get())));
     EXPECT_CALL(mock_function, Call());
 
     history_query_callback().Run(std::move(history_downloads));
     mock_function.Call();
   }
 
   // Now pass along the notification to the OnDownloadCreated observer from
   // DownloadUIController. It should ignore the download since it's marked as
   // being restored from history.
   ASSERT_TRUE(manager_observer());
   manager_observer()->OnDownloadCreated(manager(), item.get());
 
   // Finally, the expectation we've been waiting for:
   EXPECT_FALSE(notified_item());
 }
 
 } // namespace