Use std::function instead of base::Callback in net/http2/.

net/http2/decoder/payload_decoders/settings_payload_decoder_test.cc

 // Copyright 2016 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 "net/http2/decoder/payload_decoders/settings_payload_decoder.h"
 
 #include <stddef.h>
 
 #include <vector>
 
-#include "base/bind.h"
 #include "base/logging.h"
 #include "net/http2/decoder/frame_parts.h"
 #include "net/http2/decoder/frame_parts_collector.h"
 #include "net/http2/decoder/http2_frame_decoder_listener.h"
 #include "net/http2/decoder/payload_decoders/payload_decoder_base_test_util.h"
 #include "net/http2/http2_constants.h"
 #include "net/http2/http2_constants_test_util.h"
 #include "net/http2/http2_structures_test_util.h"
 #include "net/http2/tools/http2_frame_builder.h"
 #include "net/http2/tools/http2_random.h"
@@ skipping 49 matching lines @@
   void OnFrameSizeError(const Http2FrameHeader& header) override {
     VLOG(1) << "OnFrameSizeError: " << header;
     FrameError(header)->OnFrameSizeError(header);
   }
 };
 
 class SettingsPayloadDecoderTest
     : public AbstractPayloadDecoderTest<SettingsPayloadDecoder,
                                         SettingsPayloadDecoderPeer,
                                         Listener> {
- public:
-  static bool ApproveSizeForSettingsWrongSize(size_t size) {
-    // Should get an error if size is not an integral multiple of the size
-    // of one setting.
-    return 0 != (size % Http2SettingFields::EncodedSize());
-  }
-
-  static bool ApproveSizeForSettingsAkcWrongSize(size_t size) {
-    return size != 0;
-  }
-
  protected:
   Http2SettingFields RandSettingsFields() {
     Http2SettingFields fields;
     test::Randomize(&fields, RandomPtr());
     return fields;
   }
 };
 
 // Confirm we get an error if the SETTINGS payload is not the correct size
 // to hold exactly zero or more whole Http2SettingFields.
 TEST_F(SettingsPayloadDecoderTest, SettingsWrongSize) {
+  auto approve_size = [](size_t size) {
+    // Should get an error if size is not an integral multiple of the size
+    // of one setting.
+    return 0 != (size % Http2SettingFields::EncodedSize());
+  };
   Http2FrameBuilder fb;
   fb.Append(RandSettingsFields());
   fb.Append(RandSettingsFields());
   fb.Append(RandSettingsFields());
-  EXPECT_TRUE(VerifyDetectsFrameSizeError(
-      0, fb.buffer(),
-      base::Bind(
-          &SettingsPayloadDecoderTest::ApproveSizeForSettingsWrongSize)));
+  EXPECT_TRUE(VerifyDetectsFrameSizeError(0, fb.buffer(), approve_size));
 }
 
 // Confirm we get an error if the SETTINGS ACK payload is not empty.
 TEST_F(SettingsPayloadDecoderTest, SettingsAkcWrongSize) {
+  auto approve_size = [](size_t size) { return size != 0; };
   Http2FrameBuilder fb;
   fb.Append(RandSettingsFields());
   fb.Append(RandSettingsFields());
   fb.Append(RandSettingsFields());
-  EXPECT_TRUE(VerifyDetectsFrameSizeError(
-      Http2FrameFlag::FLAG_ACK, fb.buffer(),
-      base::Bind(
-          &SettingsPayloadDecoderTest::ApproveSizeForSettingsAkcWrongSize)));
+  EXPECT_TRUE(VerifyDetectsFrameSizeError(Http2FrameFlag::FLAG_ACK, fb.buffer(),
+                                          approve_size));
 }
 
 // SETTINGS must have stream_id==0, but the payload decoder doesn't check that.
 TEST_F(SettingsPayloadDecoderTest, SettingsAck) {
   for (int stream_id = 0; stream_id < 3; ++stream_id) {
     Http2FrameHeader header(0, Http2FrameType::SETTINGS,
                             RandFlags() | Http2FrameFlag::FLAG_ACK, stream_id);
     set_frame_header(header);
     FrameParts expected(header);
     EXPECT_TRUE(DecodePayloadAndValidateSeveralWays("", expected));
@@ skipping 34 matching lines @@
     fb.Append(fields);
     expected.settings.push_back(fields);
   }
   ASSERT_EQ(size, fb.size());
   EXPECT_TRUE(DecodePayloadAndValidateSeveralWays(fb.buffer(), expected));
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net