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

Unified Diff: net/quic/test_tools/quic_test_utils.h

Issue 2102253003: Make SpdyHeaderBlock non-copyable. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: iOS fix. Created 4 years, 6 months 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
« no previous file with comments | « net/quic/quic_spdy_stream_test.cc ('k') | net/spdy/bidirectional_stream_spdy_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/test_tools/quic_test_utils.h
diff --git a/net/quic/test_tools/quic_test_utils.h b/net/quic/test_tools/quic_test_utils.h
index 25e09731d263349773cc0b6da3041d7e0ae95ccd..dd0d83d2b21ac26e759de3575ad3cb295ec6d314 100644
--- a/net/quic/test_tools/quic_test_utils.h
+++ b/net/quic/test_tools/quic_test_utils.h
@@ -13,6 +13,7 @@
#include <cstdint>
#include <memory>
#include <string>
+#include <utility>
#include <vector>
#include "base/macros.h"
@@ -557,6 +558,7 @@ class MockQuicSpdySession : public QuicSpdySession {
~MockQuicSpdySession() override;
QuicCryptoStream* GetCryptoStream() override { return crypto_stream_.get(); }
+ const SpdyHeaderBlock& GetWriteHeaders() { return write_headers_; }
// From QuicSession.
MOCK_METHOD3(OnConnectionClosed,
@@ -604,9 +606,21 @@ class MockQuicSpdySession : public QuicSpdySession {
QuicStreamId promised_stream_id,
size_t frame_len,
const QuicHeaderList& header_list));
- MOCK_METHOD5(WriteHeaders,
+ // Methods taking non-copyable types like SpdyHeaderBlock by value cannot be
+ // mocked directly.
+ size_t WriteHeaders(
+ QuicStreamId id,
+ SpdyHeaderBlock headers,
+ bool fin,
+ SpdyPriority priority,
+ QuicAckListenerInterface* ack_notifier_delegate) override {
+ write_headers_ = std::move(headers);
+ return WriteHeadersMock(id, write_headers_, fin, priority,
+ ack_notifier_delegate);
+ }
+ MOCK_METHOD5(WriteHeadersMock,
size_t(QuicStreamId id,
- SpdyHeaderBlock headers,
+ const SpdyHeaderBlock& headers,
bool fin,
SpdyPriority priority,
QuicAckListenerInterface* ack_notifier_delegate));
@@ -616,6 +630,7 @@ class MockQuicSpdySession : public QuicSpdySession {
private:
std::unique_ptr<QuicCryptoStream> crypto_stream_;
+ SpdyHeaderBlock write_headers_;
DISALLOW_COPY_AND_ASSIGN(MockQuicSpdySession);
};
« no previous file with comments | « net/quic/quic_spdy_stream_test.cc ('k') | net/spdy/bidirectional_stream_spdy_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698