summaryrefslogtreecommitdiffstats
path: root/net/websockets
diff options
context:
space:
mode:
Diffstat (limited to 'net/websockets')
-rw-r--r--net/websockets/websocket_handshake_handler.cc10
-rw-r--r--net/websockets/websocket_handshake_handler.h6
-rw-r--r--net/websockets/websocket_handshake_handler_unittest.cc10
-rw-r--r--net/websockets/websocket_job.cc4
-rw-r--r--net/websockets/websocket_job.h2
-rw-r--r--net/websockets/websocket_job_spdy2_unittest.cc10
-rw-r--r--net/websockets/websocket_job_spdy3_unittest.cc10
7 files changed, 26 insertions, 26 deletions
diff --git a/net/websockets/websocket_handshake_handler.cc b/net/websockets/websocket_handshake_handler.cc
index 9f313b7..888a546 100644
--- a/net/websockets/websocket_handshake_handler.cc
+++ b/net/websockets/websocket_handshake_handler.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
@@ -265,7 +265,7 @@ HttpRequestInfo WebSocketHandshakeRequestHandler::GetRequestInfo(
}
bool WebSocketHandshakeRequestHandler::GetRequestHeaderBlock(
- const GURL& url, spdy::SpdyHeaderBlock* headers, std::string* challenge) {
+ const GURL& url, SpdyHeaderBlock* headers, std::string* challenge) {
// We don't set "method" and "version". These are fixed value in WebSocket
// protocol.
(*headers)["url"] = url.spec();
@@ -301,7 +301,7 @@ bool WebSocketHandshakeRequestHandler::GetRequestHeaderBlock(
}
// Others should be sent out to |headers|.
std::string name = StringToLowerASCII(iter.name());
- spdy::SpdyHeaderBlock::iterator found = headers->find(name);
+ SpdyHeaderBlock::iterator found = headers->find(name);
if (found == headers->end()) {
(*headers)[name] = iter.values();
} else {
@@ -446,7 +446,7 @@ bool WebSocketHandshakeResponseHandler::ParseResponseInfo(
}
bool WebSocketHandshakeResponseHandler::ParseResponseHeaderBlock(
- const spdy::SpdyHeaderBlock& headers,
+ const SpdyHeaderBlock& headers,
const std::string& challenge) {
std::string response_message;
if (protocol_version_ >= kMinVersionOfHybiNewHandshake) {
@@ -466,7 +466,7 @@ bool WebSocketHandshakeResponseHandler::ParseResponseHeaderBlock(
response_message += "Sec-WebSocket-Accept: " + websocket_accept + "\r\n";
}
- for (spdy::SpdyHeaderBlock::const_iterator iter = headers.begin();
+ for (SpdyHeaderBlock::const_iterator iter = headers.begin();
iter != headers.end();
++iter) {
// For each value, if the server sends a NUL-separated list of values,
diff --git a/net/websockets/websocket_handshake_handler.h b/net/websockets/websocket_handshake_handler.h
index be6c13d..46a0a39 100644
--- a/net/websockets/websocket_handshake_handler.h
+++ b/net/websockets/websocket_handshake_handler.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
//
@@ -68,7 +68,7 @@ class NET_EXPORT_PRIVATE WebSocketHandshakeRequestHandler {
// Gets request as SpdyHeaderBlock.
// Also, fills challenge data in |challenge|.
bool GetRequestHeaderBlock(const GURL& url,
- spdy::SpdyHeaderBlock* headers,
+ SpdyHeaderBlock* headers,
std::string* challenge);
// Gets WebSocket handshake raw request message to open WebSocket
// connection.
@@ -117,7 +117,7 @@ class NET_EXPORT_PRIVATE WebSocketHandshakeResponseHandler {
bool ParseResponseInfo(const HttpResponseInfo& response_info,
const std::string& challenge);
// Parses WebSocket handshake response as SpdyHeaderBlock.
- bool ParseResponseHeaderBlock(const spdy::SpdyHeaderBlock& headers,
+ bool ParseResponseHeaderBlock(const SpdyHeaderBlock& headers,
const std::string& challenge);
// Gets the headers value.
diff --git a/net/websockets/websocket_handshake_handler_unittest.cc b/net/websockets/websocket_handshake_handler_unittest.cc
index 4750e1a..606e528 100644
--- a/net/websockets/websocket_handshake_handler_unittest.cc
+++ b/net/websockets/websocket_handshake_handler_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
@@ -489,7 +489,7 @@ TEST(WebSocketHandshakeHandlerTest, SpdyRequestResponse) {
GURL url("ws://example.com/demo");
std::string challenge;
- spdy::SpdyHeaderBlock headers;
+ SpdyHeaderBlock headers;
ASSERT_TRUE(request_handler.GetRequestHeaderBlock(url, &headers, &challenge));
EXPECT_EQ(url.spec(), headers["url"]);
@@ -559,7 +559,7 @@ TEST(WebSocketHandshakeHandlerTest, SpdyRequestResponseHybi06Handshake) {
GURL url("ws://example.com/demo");
std::string challenge;
- spdy::SpdyHeaderBlock headers;
+ SpdyHeaderBlock headers;
ASSERT_TRUE(request_handler.GetRequestHeaderBlock(url, &headers, &challenge));
EXPECT_EQ(url.spec(), headers["url"]);
@@ -623,7 +623,7 @@ TEST(WebSocketHandshakeHandlerTest, SpdyRequestResponseWithCookies) {
GURL url("ws://example.com/demo");
std::string challenge;
- spdy::SpdyHeaderBlock headers;
+ SpdyHeaderBlock headers;
ASSERT_TRUE(request_handler.GetRequestHeaderBlock(url, &headers, &challenge));
EXPECT_EQ(url.spec(), headers["url"]);
@@ -699,7 +699,7 @@ TEST(WebSocketHandshakeHandlerTest,
GURL url("ws://example.com/demo");
std::string challenge;
- spdy::SpdyHeaderBlock headers;
+ SpdyHeaderBlock headers;
ASSERT_TRUE(request_handler.GetRequestHeaderBlock(url, &headers, &challenge));
EXPECT_EQ(url.spec(), headers["url"]);
diff --git a/net/websockets/websocket_job.cc b/net/websockets/websocket_job.cc
index 0be903d..0df6ac1 100644
--- a/net/websockets/websocket_job.cc
+++ b/net/websockets/websocket_job.cc
@@ -305,7 +305,7 @@ void WebSocketJob::OnSentSpdyHeaders(int result) {
}
int WebSocketJob::OnReceivedSpdyResponseHeader(
- const spdy::SpdyHeaderBlock& headers, int status) {
+ const SpdyHeaderBlock& headers, int status) {
DCHECK_NE(INITIALIZED, state_);
if (state_ != CONNECTING)
return status;
@@ -387,7 +387,7 @@ void WebSocketJob::LoadCookieCallback(const std::string& cookie) {
void WebSocketJob::DoSendData() {
if (spdy_websocket_stream_.get()) {
- linked_ptr<spdy::SpdyHeaderBlock> headers(new spdy::SpdyHeaderBlock);
+ linked_ptr<SpdyHeaderBlock> headers(new SpdyHeaderBlock);
handshake_request_->GetRequestHeaderBlock(
socket_->url(), headers.get(), &challenge_);
spdy_websocket_stream_->SendRequest(headers);
diff --git a/net/websockets/websocket_job.h b/net/websockets/websocket_job.h
index 0abac3c..b99c587 100644
--- a/net/websockets/websocket_job.h
+++ b/net/websockets/websocket_job.h
@@ -81,7 +81,7 @@ class NET_EXPORT WebSocketJob
virtual void OnCreatedSpdyStream(int status) OVERRIDE;
virtual void OnSentSpdyHeaders(int status) OVERRIDE;
virtual int OnReceivedSpdyResponseHeader(
- const spdy::SpdyHeaderBlock& headers, int status) OVERRIDE;
+ const SpdyHeaderBlock& headers, int status) OVERRIDE;
virtual void OnSentSpdyData(int amount_sent) OVERRIDE;
virtual void OnReceivedSpdyData(const char* data, int length) OVERRIDE;
virtual void OnCloseSpdyStream() OVERRIDE;
diff --git a/net/websockets/websocket_job_spdy2_unittest.cc b/net/websockets/websocket_job_spdy2_unittest.cc
index da47d43..471748e 100644
--- a/net/websockets/websocket_job_spdy2_unittest.cc
+++ b/net/websockets/websocket_job_spdy2_unittest.cc
@@ -909,26 +909,26 @@ void WebSocketJobSpdy2Test::TestConnectBySpdy(
MockRead(SYNCHRONOUS, 0, 5) // EOF
};
- const spdy::SpdyStreamId kStreamId = 1;
- scoped_ptr<spdy::SpdyFrame> request_frame(
+ const SpdyStreamId kStreamId = 1;
+ scoped_ptr<SpdyFrame> request_frame(
ConstructSpdyWebSocketHandshakeRequestFrame(
kHandshakeRequestForSpdy,
arraysize(kHandshakeRequestForSpdy) / 2,
kStreamId,
MEDIUM));
- scoped_ptr<spdy::SpdyFrame> response_frame(
+ scoped_ptr<SpdyFrame> response_frame(
ConstructSpdyWebSocketHandshakeResponseFrame(
kHandshakeResponseForSpdy,
arraysize(kHandshakeResponseForSpdy) / 2,
kStreamId,
MEDIUM));
- scoped_ptr<spdy::SpdyFrame> data_hello_frame(
+ scoped_ptr<SpdyFrame> data_hello_frame(
ConstructSpdyWebSocketDataFrame(
kDataHello,
kDataHelloLength,
kStreamId,
false));
- scoped_ptr<spdy::SpdyFrame> data_world_frame(
+ scoped_ptr<SpdyFrame> data_world_frame(
ConstructSpdyWebSocketDataFrame(
kDataWorld,
kDataWorldLength,
diff --git a/net/websockets/websocket_job_spdy3_unittest.cc b/net/websockets/websocket_job_spdy3_unittest.cc
index 7f7491c..2c846ec 100644
--- a/net/websockets/websocket_job_spdy3_unittest.cc
+++ b/net/websockets/websocket_job_spdy3_unittest.cc
@@ -909,26 +909,26 @@ void WebSocketJobSpdy3Test::TestConnectBySpdy(
MockRead(SYNCHRONOUS, 0, 5) // EOF
};
- const spdy::SpdyStreamId kStreamId = 1;
- scoped_ptr<spdy::SpdyFrame> request_frame(
+ const SpdyStreamId kStreamId = 1;
+ scoped_ptr<SpdyFrame> request_frame(
ConstructSpdyWebSocketHandshakeRequestFrame(
kHandshakeRequestForSpdy,
arraysize(kHandshakeRequestForSpdy) / 2,
kStreamId,
MEDIUM));
- scoped_ptr<spdy::SpdyFrame> response_frame(
+ scoped_ptr<SpdyFrame> response_frame(
ConstructSpdyWebSocketHandshakeResponseFrame(
kHandshakeResponseForSpdy,
arraysize(kHandshakeResponseForSpdy) / 2,
kStreamId,
MEDIUM));
- scoped_ptr<spdy::SpdyFrame> data_hello_frame(
+ scoped_ptr<SpdyFrame> data_hello_frame(
ConstructSpdyWebSocketDataFrame(
kDataHello,
kDataHelloLength,
kStreamId,
false));
- scoped_ptr<spdy::SpdyFrame> data_world_frame(
+ scoped_ptr<SpdyFrame> data_world_frame(
ConstructSpdyWebSocketDataFrame(
kDataWorld,
kDataWorldLength,
generated by cgit v1.1 at 2025-02-12 07:55:22 +0000