1 files changed, 13 insertions, 14 deletions

diff --git a/net/spdy/spdy_websocket_stream_spdy3_unittest.cc b/net/spdy/spdy_websocket_stream_spdy3_unittest.cc
index 447da99..8a64f82 100644
--- a/net/spdy/spdy_websocket_stream_spdy3_unittest.cc
+++ b/net/spdy/spdy_websocket_stream_spdy3_unittest.cc
@@ -16,12 +16,9 @@
 #include "net/spdy/spdy_http_utils.h"
 #include "net/spdy/spdy_protocol.h"
 #include "net/spdy/spdy_session.h"
-#include "net/spdy/spdy_test_util_spdy3.h"
-#include "net/spdy/spdy_websocket_test_util_spdy3.h"
+#include "net/spdy/spdy_websocket_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using namespace net::test_spdy3;
-
 namespace net {
 
 namespace {
@@ -189,7 +186,12 @@ class SpdyWebSocketStreamSpdy3Test : public testing::Test {
  protected:
   SpdyWebSocketStreamSpdy3Test()
       : spdy_util_(kProtoSPDY3),
-        session_deps_(kProtoSPDY3) {}
+        spdy_settings_id_to_set_(SETTINGS_MAX_CONCURRENT_STREAMS),
+        spdy_settings_flags_to_set_(SETTINGS_FLAG_PLEASE_PERSIST),
+        spdy_settings_value_to_set_(1),
+        session_deps_(kProtoSPDY3),
+        stream_id_(0),
+        created_stream_id_(0) {}
   virtual ~SpdyWebSocketStreamSpdy3Test() {}
 
   virtual void SetUp() {
@@ -200,10 +202,6 @@ class SpdyWebSocketStreamSpdy3Test : public testing::Test {
                                        ProxyServer::Direct(),
                                        kPrivacyModeDisabled);
 
-    spdy_settings_id_to_set_ = SETTINGS_MAX_CONCURRENT_STREAMS;
-    spdy_settings_flags_to_set_ = SETTINGS_FLAG_PLEASE_PERSIST;
-    spdy_settings_value_to_set_ = 1;
-
     spdy_settings_to_send_[spdy_settings_id_to_set_] =
         SettingsFlagsAndValue(
             SETTINGS_FLAG_PERSISTED, spdy_settings_value_to_set_);
@@ -216,21 +214,22 @@ class SpdyWebSocketStreamSpdy3Test : public testing::Test {
   void Prepare(SpdyStreamId stream_id) {
     stream_id_ = stream_id;
 
-    request_frame_.reset(ConstructSpdyWebSocketSynStream(
+    request_frame_.reset(spdy_util_.ConstructSpdyWebSocketSynStream(
         stream_id_,
         "/echo",
         "example.com",
         "http://example.com/wsdemo"));
 
-    response_frame_.reset(ConstructSpdyWebSocketSynReply(stream_id_));
+    response_frame_.reset(
+        spdy_util_.ConstructSpdyWebSocketSynReply(stream_id_));
 
-    message_frame_.reset(ConstructSpdyWebSocketDataFrame(
+    message_frame_.reset(spdy_util_.ConstructSpdyWebSocketDataFrame(
         kMessageFrame,
         kMessageFrameLength,
         stream_id_,
         false));
 
-    closing_frame_.reset(ConstructSpdyWebSocketDataFrame(
+    closing_frame_.reset(spdy_util_.ConstructSpdyWebSocketDataFrame(
         kClosingFrame,
         kClosingFrameLength,
         stream_id_,
@@ -284,7 +283,7 @@ class SpdyWebSocketStreamSpdy3Test : public testing::Test {
     websocket_stream_->SendRequest(headers.Pass());
   }
 
-  SpdyTestUtil spdy_util_;
+  SpdyWebSocketTestUtil spdy_util_;
   SpdySettingsIds spdy_settings_id_to_set_;
   SpdySettingsFlags spdy_settings_flags_to_set_;
   uint32 spdy_settings_value_to_set_;