Remove deprecated std::ptr_fun and std::bind2nd

std::ptr_fun and std::bind2nd are deprecated in C++11, and removed in
C++17. This CL removes their usage, so that the code base is ready for
C++17.

Bug: 752720
Change-Id: I5a33143768a32864367f6889c4d1dbd0a26ee9e2
Reviewed-on: https://chromium-review.googlesource.com/1025541Reviewed-by: Nico Weber <thakis@chromium.org>
Reviewed-by: Sorin Jianu <sorin@chromium.org>
Reviewed-by: Maksim Ivanov <emaxx@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#553595}

components/policy/core/common/preg_parser.cc

@@ -8,7 +8,6 @@
 #include <stdint.h>
 
 #include <algorithm>
-#include <functional>
 #include <iterator>
 #include <limits>
 #include <memory>
@@ -146,7 +145,7 @@ bool DecodePRegStringValue(const std::vector<uint8_t>& data,
       reinterpret_cast<const base::char16*>(data.data());
   base::string16 utf16_str;
   std::transform(chars, chars + len - 1, std::back_inserter(utf16_str),
-                 std::ptr_fun(base::ByteSwapToLE16));
+                 base::ByteSwapToLE16);
   // Note: UTF16ToUTF8() only checks whether all chars are valid code points,
   // but not whether they're valid characters. IsStringUTF8(), however, does.
   *value = base::UTF16ToUTF8(utf16_str);

components/update_client/background_downloader_win.cc

@@ -719,9 +719,11 @@ HRESULT BackgroundDownloader::QueueBitsJob(const GURL& url,
 HRESULT BackgroundDownloader::CreateOrOpenJob(const GURL& url,
                                               ComPtr<IBackgroundCopyJob>* job) {
   std::vector<ComPtr<IBackgroundCopyJob>> jobs;
-  HRESULT hr =
-      FindBitsJobIf(std::bind2nd(std::ptr_fun(JobFileUrlEqualPredicate), url),
-                    bits_manager_, &jobs);
+  HRESULT hr = FindBitsJobIf(
+      [&url](ComPtr<IBackgroundCopyJob> job) {
+        return JobFileUrlEqualPredicate(job, url);
+      },
+      bits_manager_, &jobs);
   if (SUCCEEDED(hr) && !jobs.empty()) {
     *job = jobs.front();
     return S_FALSE;
@@ -899,9 +901,11 @@ void BackgroundDownloader::CleanupStaleJobs() {
   last_sweep = current_time;
 
   std::vector<ComPtr<IBackgroundCopyJob>> jobs;
-  FindBitsJobIf(std::bind2nd(std::ptr_fun(JobCreationOlderThanDaysPredicate),
-                             kPurgeStaleJobsAfterDays),
-                bits_manager_, &jobs);
+  FindBitsJobIf(
+      [](ComPtr<IBackgroundCopyJob> job) {
+        return JobCreationOlderThanDaysPredicate(job, kPurgeStaleJobsAfterDays);
+      },
+      bits_manager_, &jobs);
 
   for (const auto& job : jobs)
     CleanupJob(job);