[not for commit] try out fix with darin's cl.

content/browser/websockets/websocket_impl.cc

Index: content/browser/websockets/websocket_impl.cc
diff --git a/content/browser/websockets/websocket_impl.cc b/content/browser/websockets/websocket_impl.cc
index d391005036d46609ae97749b74dc22782a0e3a34..bcc78c949c14bdafa4a23cf54b007f5b9d3ca156 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 mojom::WebSocketMessageType to a
+// Convert a blink::mojom::WebSocketMessageType to a
 // net::WebSocketFrameHeader::OpCode
 net::WebSocketFrameHeader::OpCode MessageTypeToOpCode(
-    mojom::WebSocketMessageType type) {
-  DCHECK(type == mojom::WebSocketMessageType::CONTINUATION ||
-         type == mojom::WebSocketMessageType::TEXT ||
-         type == mojom::WebSocketMessageType::BINARY);
+    blink::mojom::WebSocketMessageType type) {
+  DCHECK(type == blink::mojom::WebSocketMessageType::CONTINUATION ||
+         type == blink::mojom::WebSocketMessageType::TEXT ||
+         type == blink::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>(mojom::WebSocketMessageType::CONTINUATION) ==
+      static_cast<OpCode>(blink::mojom::WebSocketMessageType::CONTINUATION) ==
           net::WebSocketFrameHeader::kOpCodeContinuation,
       "enum values must match for opcode continuation");
   static_assert(
-      static_cast<OpCode>(mojom::WebSocketMessageType::TEXT) ==
+      static_cast<OpCode>(blink::mojom::WebSocketMessageType::TEXT) ==
           net::WebSocketFrameHeader::kOpCodeText,
       "enum values must match for opcode text");
   static_assert(
-      static_cast<OpCode>(mojom::WebSocketMessageType::BINARY) ==
+      static_cast<OpCode>(blink::mojom::WebSocketMessageType::BINARY) ==
           net::WebSocketFrameHeader::kOpCodeBinary,
       "enum values must match for opcode binary");
   return static_cast<OpCode>(type);
 }
 
-mojom::WebSocketMessageType OpCodeToMessageType(
+blink::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<mojom::WebSocketMessageType>(opCode);
+  return static_cast<blink::mojom::WebSocketMessageType>(opCode);
 }
 
 }  // namespace
@@ -245,12 +245,12 @@ ChannelState WebSocketImpl::WebSocketEventHandler::OnStartOpeningHandshake(
   if (!should_send)
     return WebSocketEventInterface::CHANNEL_ALIVE;
 
-  mojom::WebSocketHandshakeRequestPtr request_to_pass(
-      mojom::WebSocketHandshakeRequest::New());
+  blink::mojom::WebSocketHandshakeRequestPtr request_to_pass(
+      blink::mojom::WebSocketHandshakeRequest::New());
   request_to_pass->url.Swap(&request->url);
   net::HttpRequestHeaders::Iterator it(request->headers);
   while (it.GetNext()) {
-    mojom::HttpHeaderPtr header(mojom::HttpHeader::New());
+    blink::mojom::HttpHeaderPtr header(blink::mojom::HttpHeader::New());
     header->name = it.name();
     header->value = it.value();
     request_to_pass->headers.push_back(std::move(header));
@@ -277,15 +277,15 @@ ChannelState WebSocketImpl::WebSocketEventHandler::OnFinishOpeningHandshake(
   if (!should_send)
     return WebSocketEventInterface::CHANNEL_ALIVE;
 
-  mojom::WebSocketHandshakeResponsePtr response_to_pass(
-      mojom::WebSocketHandshakeResponse::New());
+  blink::mojom::WebSocketHandshakeResponsePtr response_to_pass(
+      blink::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)) {
-    mojom::HttpHeaderPtr header(mojom::HttpHeader::New());
+    blink::mojom::HttpHeaderPtr header(blink::mojom::HttpHeader::New());
     header->name = name;
     header->value = value;
     response_to_pass->headers.push_back(std::move(header));
@@ -351,7 +351,7 @@ void WebSocketImpl::WebSocketEventHandler::SSLErrorHandlerDelegate::
 
 WebSocketImpl::WebSocketImpl(
     Delegate* delegate,
-    mojom::WebSocketRequest request,
+    blink::mojom::WebSocketRequest request,
     int frame_id,
     base::TimeDelta delay)
     : delegate_(delegate),
@@ -374,16 +374,11 @@ void WebSocketImpl::GoAway() {
 
 void WebSocketImpl::AddChannelRequest(
     const GURL& socket_url,
-    mojo::Array<mojo::String> requested_protocols_mojo,
+    const std::vector<std::string>& requested_protocols,
     const url::Origin& origin,
     const GURL& first_party_for_cookies,
-    const mojo::String& user_agent_override,
-    mojom::WebSocketClientPtr client) {
-  // Convert to STL types.
-  std::vector<std::string> requested_protocols(
-      requested_protocols_mojo.begin(),
-      requested_protocols_mojo.end());
-
+    const std::string& user_agent_override,
+    blink::mojom::WebSocketClientPtr client) {
   DVLOG(3) << "WebSocketImpl::AddChannelRequest @"
            << reinterpret_cast<void*>(this)
            << " socket_url=\"" << socket_url << "\" requested_protocols=\""
@@ -420,8 +415,8 @@ void WebSocketImpl::AddChannelRequest(
   }
 }
 
-void WebSocketImpl::SendFrame(bool fin, mojom::WebSocketMessageType type,
-                              mojo::Array<uint8_t> data) {
+void WebSocketImpl::SendFrame(bool fin, blink::mojom::WebSocketMessageType type,
+                              const std::vector<uint8_t>& data) {
   DVLOG(3) << "WebSocketImpl::SendFrame @"
            << reinterpret_cast<void*>(this) << " fin=" << fin
            << " type=" << type << " data is " << data.size() << " bytes";
@@ -462,7 +457,7 @@ void WebSocketImpl::SendFlowControl(int64_t quota) {
 }
 
 void WebSocketImpl::StartClosingHandshake(uint16_t code,
-                                          const mojo::String& reason) {
+                                          const std::string& reason) {
   DVLOG(3) << "WebSocketImpl::StartClosingHandshake @"
            << reinterpret_cast<void*>(this)
            << " code=" << code << " reason=\"" << reason << "\"";