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

Unified Diff: net/spdy/spdy_http_stream_spdy3_unittest.cc

Issue 9582034: Fork SPDY/2 and SPDY/3 versions of our SPDY tests, in preparation for landing (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Fix merge bug Created 8 years, 10 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/spdy/spdy_http_stream_spdy2_unittest.cc ('k') | net/spdy/spdy_http_stream_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/spdy_http_stream_spdy3_unittest.cc
===================================================================
--- net/spdy/spdy_http_stream_spdy3_unittest.cc (revision 124690)
+++ net/spdy/spdy_http_stream_spdy3_unittest.cc (working copy)
@@ -12,16 +12,18 @@
#include "net/http/http_response_headers.h"
#include "net/http/http_response_info.h"
#include "net/spdy/spdy_session.h"
-#include "net/spdy/spdy_test_util.h"
+#include "net/spdy/spdy_test_util_spdy3.h"
#include "testing/gtest/include/gtest/gtest.h"
+using namespace net::test_spdy3;
+
namespace net {
-class SpdyHttpStreamTest : public testing::Test {
+class SpdyHttpStreamSpdy3Test : public testing::Test {
public:
OrderedSocketData* data() { return data_.get(); }
protected:
- SpdyHttpStreamTest() {}
+ SpdyHttpStreamSpdy3Test() {}
void EnableCompression(bool enabled) {
spdy::SpdyFramer::set_enable_compression_default(enabled);
@@ -68,7 +70,7 @@
scoped_refptr<TransportSocketParams> transport_params_;
};
-TEST_F(SpdyHttpStreamTest, SendRequest) {
+TEST_F(SpdyHttpStreamSpdy3Test, SendRequest) {
EnableCompression(false);
SpdySession::SetSSLMode(false);
@@ -117,7 +119,7 @@
EXPECT_TRUE(data()->at_write_eof());
}
-TEST_F(SpdyHttpStreamTest, SendChunkedPost) {
+TEST_F(SpdyHttpStreamSpdy3Test, SendChunkedPost) {
EnableCompression(false);
SpdySession::SetSSLMode(false);
UploadDataStream::set_merge_chunks(false);
@@ -181,7 +183,7 @@
}
// Test case for bug: http://code.google.com/p/chromium/issues/detail?id=50058
-TEST_F(SpdyHttpStreamTest, SpdyURLTest) {
+TEST_F(SpdyHttpStreamSpdy3Test, SpdyURLTest) {
EnableCompression(false);
SpdySession::SetSSLMode(false);
@@ -238,6 +240,8 @@
EXPECT_TRUE(data()->at_write_eof());
}
+namespace {
+
void GetECOriginBoundCertAndProof(const std::string& origin,
OriginBoundCertService* obc_service,
std::string* cert,
@@ -277,13 +281,15 @@
proof->assign(proof_data.begin(), proof_data.end());
}
+} // namespace
+
// TODO(rch): When openssl supports origin bound certifictes, this
// guard can be removed
#if !defined(USE_OPENSSL)
// Test that if we request a resource for a new origin on a session that
// used origin bound certificates, that we send a CREDENTIAL frame for
// the new origin before we send the new request.
-void SpdyHttpStreamTest::TestSendCredentials(
+void SpdyHttpStreamSpdy3Test::TestSendCredentials(
OriginBoundCertService* obc_service,
const std::string& cert,
const std::string& proof,
@@ -441,7 +447,7 @@
DISALLOW_COPY_AND_ASSIGN(MockECSignatureCreatorFactory);
};
-TEST_F(SpdyHttpStreamTest, SendCredentialsEC) {
+TEST_F(SpdyHttpStreamSpdy3Test, SendCredentialsEC) {
scoped_ptr<crypto::ECSignatureCreatorFactory> ec_signature_creator_factory(
new MockECSignatureCreatorFactory());
crypto::ECSignatureCreator::SetFactoryForTesting(
« no previous file with comments | « net/spdy/spdy_http_stream_spdy2_unittest.cc ('k') | net/spdy/spdy_http_stream_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698