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

Unified Diff: net/spdy/spdy_websocket_test_util_spdy3.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_websocket_test_util_spdy3.h ('k') | net/websockets/websocket_job.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/spdy_websocket_test_util_spdy3.cc
===================================================================
--- net/spdy/spdy_websocket_test_util_spdy3.cc (revision 124690)
+++ net/spdy/spdy_websocket_test_util_spdy3.cc (working copy)
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "net/spdy/spdy_websocket_test_util.h"
+#include "net/spdy/spdy_websocket_test_util_spdy3.h"
#include "net/spdy/spdy_framer.h"
#include "net/spdy/spdy_http_utils.h"
-#include "net/spdy/spdy_test_util.h"
+#include "net/spdy/spdy_test_util_spdy3.h"
static const int kDefaultAssociatedStreamId = 0;
static const bool kDefaultCompressed = false;
@@ -17,6 +17,8 @@
namespace net {
+namespace test_spdy3 {
+
spdy::SpdyFrame* ConstructSpdyWebSocketHandshakeRequestFrame(
const char* const headers[],
int header_count,
@@ -90,4 +92,6 @@
fin ? spdy::DATA_FLAG_FIN : spdy::DATA_FLAG_NONE);
}
+} // namespace test_spdy3
+
} // namespace net
« no previous file with comments | « net/spdy/spdy_websocket_test_util_spdy3.h ('k') | net/websockets/websocket_job.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698