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

net/http2/hpack/huffman/http2_hpack_huffman_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/hpack/huffman/http2_hpack_huffman_decoder.h"
 
 // Tests of HpackHuffmanDecoder and HuffmanBitBuffer.
 
 #include <iostream>
 #include <string>
 
-#include "base/bind.h"
-#include "base/bind_helpers.h"
 #include "base/macros.h"
 #include "base/strings/string_piece.h"
 #include "net/http2/decoder/decode_buffer.h"
 #include "net/http2/decoder/decode_status.h"
 #include "net/http2/tools/failure.h"
 #include "net/http2/tools/random_decoder_test.h"
 #include "net/spdy/spdy_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::AssertionResult;
@@ skipping 171 matching lines @@
       case DecoderChoice::IF_TREE:
         return decoder_.DecodeWithIfTreeAndStruct(sp, &output_buffer_);
       case DecoderChoice::SHORT_CODE:
         return decoder_.DecodeShortCodesFirst(sp, &output_buffer_);
     }
 
     NOTREACHED();
     return false;
   }
 
-  AssertionResult ValidatorForHuffmanDecodeAndValidateSeveralWays(
-      StringPiece expected_plain) {
-    VERIFY_EQ(output_buffer_.size(), expected_plain.size());
-    VERIFY_EQ(output_buffer_, expected_plain);
-    return AssertionSuccess();
-  }
-
   AssertionResult HuffmanDecodeAndValidateSeveralWays(
       StringPiece encoded,
       StringPiece expected_plain) {
     input_bytes_expected_ = encoded.size();
+    NoArgValidator validator = [expected_plain, this]() -> AssertionResult {
+      VERIFY_EQ(output_buffer_.size(), expected_plain.size());
+      VERIFY_EQ(output_buffer_, expected_plain);
+      return AssertionSuccess();
+    };
     DecodeBuffer db(encoded);
     bool return_non_zero_on_first = false;
-    return DecodeAndValidateSeveralWays(
-        &db, return_non_zero_on_first,
-        ValidateDoneAndEmpty(
-            base::Bind(&HpackHuffmanDecoderTest::
-                           ValidatorForHuffmanDecodeAndValidateSeveralWays,
-                       base::Unretained(this), expected_plain)));
+    return DecodeAndValidateSeveralWays(&db, return_non_zero_on_first,
+                                        ValidateDoneAndEmpty(validator));
   }
 
   HpackHuffmanDecoder decoder_;
   string output_buffer_;
   size_t input_bytes_seen_;
   size_t input_bytes_expected_;
 };
 INSTANTIATE_TEST_CASE_P(AllDecoders,
                         HpackHuffmanDecoderTest,
                         ::testing::Values(DecoderChoice::IF_TREE,
@@ skipping 49 matching lines @@
     decoder.Reset();
     EXPECT_TRUE(decoder.Decode(huffman_encoded, &buffer)) << decoder;
     EXPECT_TRUE(decoder.InputProperlyTerminated()) << decoder;
     EXPECT_EQ(buffer, plain_string);
   }
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net