Index: content/browser/websockets/websocket_impl.cc |
diff --git a/content/browser/websockets/websocket_impl.cc b/content/browser/websockets/websocket_impl.cc |
index 28bbd8c571e6c90faa07607b297e30832a5d509b..6e64a7ed1b7d034906c907c3bdd560b055bf8965 100644 |
--- a/content/browser/websockets/websocket_impl.cc |
+++ b/content/browser/websockets/websocket_impl.cc |
@@ -43,38 +43,38 @@ namespace { |
typedef net::WebSocketEventInterface::ChannelState ChannelState; |
-// Convert a blink::mojom::WebSocketMessageType to a |
+// Convert a mojom::WebSocketMessageType to a |
// net::WebSocketFrameHeader::OpCode |
net::WebSocketFrameHeader::OpCode MessageTypeToOpCode( |
- blink::mojom::WebSocketMessageType type) { |
- DCHECK(type == blink::mojom::WebSocketMessageType::CONTINUATION || |
- type == blink::mojom::WebSocketMessageType::TEXT || |
- type == blink::mojom::WebSocketMessageType::BINARY); |
+ mojom::WebSocketMessageType type) { |
+ DCHECK(type == mojom::WebSocketMessageType::CONTINUATION || |
+ type == mojom::WebSocketMessageType::TEXT || |
+ type == mojom::WebSocketMessageType::BINARY); |
typedef net::WebSocketFrameHeader::OpCode OpCode; |
// These compile asserts verify that the same underlying values are used for |
// both types, so we can simply cast between them. |
static_assert( |
- static_cast<OpCode>(blink::mojom::WebSocketMessageType::CONTINUATION) == |
+ static_cast<OpCode>(mojom::WebSocketMessageType::CONTINUATION) == |
net::WebSocketFrameHeader::kOpCodeContinuation, |
"enum values must match for opcode continuation"); |
static_assert( |
- static_cast<OpCode>(blink::mojom::WebSocketMessageType::TEXT) == |
+ static_cast<OpCode>(mojom::WebSocketMessageType::TEXT) == |
net::WebSocketFrameHeader::kOpCodeText, |
"enum values must match for opcode text"); |
static_assert( |
- static_cast<OpCode>(blink::mojom::WebSocketMessageType::BINARY) == |
+ static_cast<OpCode>(mojom::WebSocketMessageType::BINARY) == |
net::WebSocketFrameHeader::kOpCodeBinary, |
"enum values must match for opcode binary"); |
return static_cast<OpCode>(type); |
} |
-blink::mojom::WebSocketMessageType OpCodeToMessageType( |
+mojom::WebSocketMessageType OpCodeToMessageType( |
net::WebSocketFrameHeader::OpCode opCode) { |
DCHECK(opCode == net::WebSocketFrameHeader::kOpCodeContinuation || |
opCode == net::WebSocketFrameHeader::kOpCodeText || |
opCode == net::WebSocketFrameHeader::kOpCodeBinary); |
// This cast is guaranteed valid by the static_assert() statements above. |
- return static_cast<blink::mojom::WebSocketMessageType>(opCode); |
+ return static_cast<mojom::WebSocketMessageType>(opCode); |
} |
} // namespace |
@@ -244,12 +244,12 @@ ChannelState WebSocketImpl::WebSocketEventHandler::OnStartOpeningHandshake( |
if (!should_send) |
return WebSocketEventInterface::CHANNEL_ALIVE; |
- blink::mojom::WebSocketHandshakeRequestPtr request_to_pass( |
- blink::mojom::WebSocketHandshakeRequest::New()); |
+ mojom::WebSocketHandshakeRequestPtr request_to_pass( |
+ mojom::WebSocketHandshakeRequest::New()); |
request_to_pass->url.Swap(&request->url); |
net::HttpRequestHeaders::Iterator it(request->headers); |
while (it.GetNext()) { |
- blink::mojom::HttpHeaderPtr header(blink::mojom::HttpHeader::New()); |
+ mojom::HttpHeaderPtr header(mojom::HttpHeader::New()); |
header->name = it.name(); |
header->value = it.value(); |
request_to_pass->headers.push_back(std::move(header)); |
@@ -276,15 +276,15 @@ ChannelState WebSocketImpl::WebSocketEventHandler::OnFinishOpeningHandshake( |
if (!should_send) |
return WebSocketEventInterface::CHANNEL_ALIVE; |
- blink::mojom::WebSocketHandshakeResponsePtr response_to_pass( |
- blink::mojom::WebSocketHandshakeResponse::New()); |
+ mojom::WebSocketHandshakeResponsePtr response_to_pass( |
+ mojom::WebSocketHandshakeResponse::New()); |
response_to_pass->url.Swap(&response->url); |
response_to_pass->status_code = response->status_code; |
response_to_pass->status_text = response->status_text; |
size_t iter = 0; |
std::string name, value; |
while (response->headers->EnumerateHeaderLines(&iter, &name, &value)) { |
- blink::mojom::HttpHeaderPtr header(blink::mojom::HttpHeader::New()); |
+ mojom::HttpHeaderPtr header(mojom::HttpHeader::New()); |
header->name = name; |
header->value = value; |
response_to_pass->headers.push_back(std::move(header)); |
@@ -350,7 +350,7 @@ void WebSocketImpl::WebSocketEventHandler::SSLErrorHandlerDelegate:: |
WebSocketImpl::WebSocketImpl( |
Delegate* delegate, |
- blink::mojom::WebSocketRequest request, |
+ mojom::WebSocketRequest request, |
int frame_id, |
base::TimeDelta delay) |
: delegate_(delegate), |
@@ -377,7 +377,7 @@ void WebSocketImpl::AddChannelRequest( |
const url::Origin& origin, |
const GURL& first_party_for_cookies, |
const std::string& user_agent_override, |
- blink::mojom::WebSocketClientPtr client) { |
+ mojom::WebSocketClientPtr client) { |
DVLOG(3) << "WebSocketImpl::AddChannelRequest @" |
<< reinterpret_cast<void*>(this) |
<< " socket_url=\"" << socket_url << "\" requested_protocols=\"" |
@@ -415,7 +415,7 @@ void WebSocketImpl::AddChannelRequest( |
} |
void WebSocketImpl::SendFrame(bool fin, |
- blink::mojom::WebSocketMessageType type, |
+ mojom::WebSocketMessageType type, |
const std::vector<uint8_t>& data) { |
DVLOG(3) << "WebSocketImpl::SendFrame @" |
<< reinterpret_cast<void*>(this) << " fin=" << fin |