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

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

Issue 2554683003: Revert of Add new HTTP/2 and HPACK decoder in net/http2/. (Closed)
Patch Set: 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/payload_decoder_base_test_util.cc
diff --git a/net/http2/decoder/payload_decoders/payload_decoder_base_test_util.cc b/net/http2/decoder/payload_decoders/payload_decoder_base_test_util.cc
deleted file mode 100644
index d96d481b63ed86e9abf3d3bbb9987858119cb5d3..0000000000000000000000000000000000000000
--- a/net/http2/decoder/payload_decoders/payload_decoder_base_test_util.cc
+++ /dev/null
@@ -1,98 +0,0 @@
-// 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/payload_decoder_base_test_util.h"
-
-#include "net/http2/decoder/frame_decoder_state_test_util.h"
-#include "net/http2/http2_structures_test_util.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-namespace net {
-namespace test {
-PayloadDecoderBaseTest::PayloadDecoderBaseTest() {
- // If the test adds more data after the frame payload,
- // stop as soon as the payload is decoded.
- stop_decode_on_done_ = true;
- frame_header_is_set_ = false;
- Randomize(&frame_header_, RandomPtr());
-}
-
-DecodeStatus PayloadDecoderBaseTest::StartDecoding(DecodeBuffer* db) {
- DVLOG(2) << "StartDecoding, db->Remaining=" << db->Remaining();
- // Make sure sub-class has set frame_header_ so that we can inject it
- // into the payload decoder below.
- if (!frame_header_is_set_) {
- ADD_FAILURE() << "frame_header_ is not set";
- return DecodeStatus::kDecodeError;
- }
- // The contract with the payload decoders is that they won't receive a
- // decode buffer that extends beyond the end of the frame.
- if (db->Remaining() > frame_header_.payload_length) {
- ADD_FAILURE() << "DecodeBuffer has too much data: " << db->Remaining()
- << " > " << frame_header_.payload_length;
- return DecodeStatus::kDecodeError;
- }
-
- // Prepare the payload decoder.
- PreparePayloadDecoder();
-
- // Reconstruct the FrameDecoderState, prepare the listener, and add it to
- // the FrameDecoderState.
- frame_decoder_state_.~FrameDecoderState();
- new (&frame_decoder_state_) FrameDecoderState;
- frame_decoder_state_.set_listener(PrepareListener());
-
- // Make sure that a listener was provided.
- if (frame_decoder_state_.listener() == nullptr) {
- ADD_FAILURE() << "PrepareListener must return a listener.";
- return DecodeStatus::kDecodeError;
- }
-
- // Now that nothing in the payload decoder should be valid, inject the
- // Http2FrameHeader whose payload we're about to decode. That header is the
- // only state that a payload decoder should expect is valid when its Start
- // method is called.
- FrameDecoderStatePeer::set_frame_header(frame_header_, &frame_decoder_state_);
- DecodeStatus status = StartDecodingPayload(db);
- if (status != DecodeStatus::kDecodeInProgress) {
- // Keep track of this so that a concrete test can verify that both fast
- // and slow decoding paths have been tested.
- ++fast_decode_count_;
- }
- return status;
-}
-
-DecodeStatus PayloadDecoderBaseTest::ResumeDecoding(DecodeBuffer* db) {
- DVLOG(2) << "ResumeDecoding, db->Remaining=" << db->Remaining();
- DecodeStatus status = ResumeDecodingPayload(db);
- if (status != DecodeStatus::kDecodeInProgress) {
- // Keep track of this so that a concrete test can verify that both fast
- // and slow decoding paths have been tested.
- ++slow_decode_count_;
- }
- return status;
-}
-
-::testing::AssertionResult
-PayloadDecoderBaseTest::DecodePayloadAndValidateSeveralWays(
- base::StringPiece payload,
- Validator validator) {
- VERIFY_TRUE(frame_header_is_set_);
- // Cap the payload to be decoded at the declared payload length. This is
- // required by the decoders' preconditions; they are designed on the
- // assumption that they're never passed more than they're permitted to
- // consume.
- // Note that it is OK if the payload is too short; the validator may be
- // designed to check for that.
- if (payload.size() > frame_header_.payload_length) {
- payload = base::StringPiece(payload.data(), frame_header_.payload_length);
- }
- DecodeBuffer db(payload);
- ResetDecodeSpeedCounters();
- const bool kMayReturnZeroOnFirst = false;
- return DecodeAndValidateSeveralWays(&db, kMayReturnZeroOnFirst, validator);
-}
-
-} // namespace test
-} // namespace net

Powered by Google App Engine
This is Rietveld 408576698