Roll Mojo to b88737ed62969ce3203085748f0d53ff4f09ba5b.

mojo/services/network/http_connection_impl.cc

 // Copyright 2015 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.
 
 #include "mojo/services/network/http_connection_impl.h"
 
 #include <limits>
 
 #include "base/bind_helpers.h"
 #include "base/callback.h"
@@ skipping 132 matching lines @@
   // WebSocket implementation.
   void Connect(const String& url,
                Array<String> protocols,
                const String& origin,
                ScopedDataPipeConsumerHandle send_stream,
                WebSocketClientPtr client) override {
     NOTREACHED();
   }
 
   void Send(bool fin, MessageType type, uint32_t num_bytes) override {
-    if (!fin || type != MESSAGE_TYPE_TEXT) {
+    if (!fin || type != MessageType::TEXT) {
       NOTIMPLEMENTED();
       Close();
     }
 
     // TODO(yzshen): It shouldn't be an issue to pass an empty message. However,
     // WebSocket{Read,Write}Queue doesn't handle that correctly.
     if (num_bytes == 0)
       return;
 
     pending_send_count_++;
@@ skipping 19 matching lines @@
 
     if (IsClosing())
       NotifyOwnerCloseIfAllDone();
   }
 
   void OnFinishedWritingReceiveStream(uint32_t num_bytes, const char* buffer) {
     if (IsClosing())
       return;
 
     if (buffer)
-      client_->DidReceiveData(true, MESSAGE_TYPE_TEXT, num_bytes);
+      client_->DidReceiveData(true, MessageType::TEXT, num_bytes);
   }
 
   // Checks whether Close() has been called.
   bool IsClosing() const { return !binding_.is_bound(); }
 
   void NotifyOwnerCloseIfAllDone() {
     DCHECK(IsClosing());
 
     if (pending_send_count_ == 0)
       connection_->OnWebSocketClosed();
@@ skipping 207 matching lines @@
     // The close operation is initiated by this object.
     NotifyOwnerCloseIfAllDone();
   } else {
     // The close operation is initiated by |web_socket_|; start closing this
     // object.
     Close();
   }
 }
 
 }  // namespace mojo