Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1497)

Unified Diff: net/http2/decoder/payload_decoders/ping_payload_decoder_test.cc

Issue 2572343002: Use std::function instead of base::Callback in net/http2/. (Closed)
Patch Set: Remove unreachable return statements. Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/http2/decoder/payload_decoders/ping_payload_decoder_test.cc
diff --git a/net/http2/decoder/payload_decoders/ping_payload_decoder_test.cc b/net/http2/decoder/payload_decoders/ping_payload_decoder_test.cc
index c3696f7c3b5dc3cc3b6dbb85a784c1ce4890519e..573341177c9761b1e90fb581423f10f4d77c87b1 100644
--- a/net/http2/decoder/payload_decoders/ping_payload_decoder_test.cc
+++ b/net/http2/decoder/payload_decoders/ping_payload_decoder_test.cc
@@ -6,7 +6,6 @@
#include <stddef.h>
-#include "base/bind.h"
#include "base/logging.h"
#include "net/http2/decoder/frame_parts.h"
#include "net/http2/decoder/frame_parts_collector.h"
@@ -61,11 +60,6 @@ class PingPayloadDecoderTest
: public AbstractPayloadDecoderTest<PingPayloadDecoder,
PingPayloadDecoderPeer,
Listener> {
- public:
- static bool ApproveSizeForWrongSize(size_t size) {
- return size != Http2PingFields::EncodedSize();
- }
-
protected:
Http2PingFields RandPingFields() {
Http2PingFields fields;
@@ -77,13 +71,14 @@ class PingPayloadDecoderTest
// Confirm we get an error if the payload is not the correct size to hold
// exactly one Http2PingFields.
TEST_F(PingPayloadDecoderTest, WrongSize) {
+ auto approve_size = [](size_t size) {
+ return size != Http2PingFields::EncodedSize();
+ };
Http2FrameBuilder fb;
fb.Append(RandPingFields());
fb.Append(RandPingFields());
fb.Append(RandPingFields());
- EXPECT_TRUE(VerifyDetectsFrameSizeError(
- 0, fb.buffer(),
- base::Bind(&PingPayloadDecoderTest::ApproveSizeForWrongSize)));
+ EXPECT_TRUE(VerifyDetectsFrameSizeError(0, fb.buffer(), approve_size));
}
TEST_F(PingPayloadDecoderTest, Ping) {

Powered by Google App Engine
This is Rietveld 408576698