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

net/http2/tools/random_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/tools/random_decoder_test.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <memory>
@@ skipping 84 matching lines @@
   {
     // Fast decode (no stopping unless decoder does so).
     DecodeBuffer input(original->cursor(), original_remaining);
     VLOG(2) << "DecodeSegmentsAndValidate with SelectRemaining";
     VERIFY_SUCCESS(
         DecodeSegmentsAndValidate(&input, SelectRemaining(), validator))
         << "\nFailed with SelectRemaining; input.Offset=" << input.Offset()
         << "; input.Remaining=" << input.Remaining();
     first_consumed = input.Offset();
   }
   if (original_remaining <= 30) {

[James Synge, 2017/01/05 21:39:06]

Given the replacement of the test-only flag with this magic number, perhaps we
should at least add a member for getting the value so that we can provide
commentary and shared code except where the value is produced.

[Bence, 2017/01/06 01:42:40]

That sound like a good idea.  I'll do that once all internal patches are merged
to Chromium.

     // Decode again, one byte at a time.
     DecodeBuffer input(original->cursor(), original_remaining);
     VLOG(2) << "DecodeSegmentsAndValidate with SelectOne";
     VERIFY_SUCCESS(DecodeSegmentsAndValidate(&input, SelectOne(), validator))
         << "\nFailed with SelectOne; input.Offset=" << input.Offset()
         << "; input.Remaining=" << input.Remaining();
     VERIFY_EQ(first_consumed, input.Offset()) << "\nFailed with SelectOne";
   }
   if (original_remaining <= 20) {
     // Decode again, one or zero bytes at a time.
     DecodeBuffer input(original->cursor(), original_remaining);
     VLOG(2) << "DecodeSegmentsAndValidate with SelectZeroAndOne";
     VERIFY_SUCCESS(DecodeSegmentsAndValidate(
         &input, SelectZeroAndOne(return_non_zero_on_first), validator))
         << "\nFailed with SelectZeroAndOne";
     VERIFY_EQ(first_consumed, input.Offset())
         << "\nFailed with SelectZeroAndOne; input.Offset=" << input.Offset()
         << "; input.Remaining=" << input.Remaining();
   }
   {
     // Decode again, with randomly selected segment sizes.
     DecodeBuffer input(original->cursor(), original_remaining);
     VLOG(2) << "DecodeSegmentsAndValidate with SelectRandom";
     VERIFY_SUCCESS(DecodeSegmentsAndValidate(
-        &input, RandomDecoderTest::SelectRandom(return_non_zero_on_first),
-        validator))
+        &input, SelectRandom(return_non_zero_on_first), validator))
         << "\nFailed with SelectRandom; input.Offset=" << input.Offset()
         << "; input.Remaining=" << input.Remaining();
     VERIFY_EQ(first_consumed, input.Offset()) << "\nFailed with SelectRandom";
   }
   VERIFY_EQ(original_remaining, original->Remaining());
   original->AdvanceCursor(first_consumed);
   VLOG(1) << "DecodeAndValidateSeveralWays - SUCCESS";
   return ::testing::AssertionSuccess();
 }
 
@@ skipping 28 matching lines @@
     return r % (remaining + 1);  // size in range [0, remaining].
   };
 }
 
 uint32_t RandomDecoderTest::RandStreamId() {
   return random_.Rand32() & StreamIdMask();
 }
 
 }  // namespace test
 }  // namespace net