Roll Mojo to b88737ed62969ce3203085748f0d53ff4f09ba5b.

mojo/services/network/http_server_apptest.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 "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
@@ skipping 20 matching lines @@
 #include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h"
 #include "third_party/mojo/src/mojo/public/cpp/application/application_test_base.h"
 
 namespace mojo {
 namespace {
 
 const int kMaxExpectedResponseLength = 2048;
 
 NetAddressPtr GetLocalHostWithAnyPort() {
   NetAddressPtr addr(NetAddress::New());
-  addr->family = NET_ADDRESS_FAMILY_IPV4;
+  addr->family = NetAddressFamily::IPV4;
   addr->ipv4 = NetAddressIPv4::New();
   addr->ipv4->port = 0;
   addr->ipv4->addr.resize(4);
   addr->ipv4->addr[0] = 127;
   addr->ipv4->addr[1] = 0;
   addr->ipv4->addr[2] = 0;
   addr->ipv4->addr[3] = 1;
 
   return addr.Pass();
 }
@@ skipping 313 matching lines @@
 
   void DidReceiveFlowControl(int64_t quota) override {}
 
   void DidFail(const String& message) override {}
 
   void DidClose(bool was_clean, uint16_t code, const String& reason) override {}
 
   void OnFinishedWritingSendStream(uint32_t num_bytes, const char* buffer) {
     EXPECT_TRUE(buffer);
 
-    web_socket_->Send(true, WebSocket::MESSAGE_TYPE_TEXT, num_bytes);
+    web_socket_->Send(true, WebSocket::MessageType::TEXT, num_bytes);
   }
 
   void OnFinishedReadingReceiveStream(uint32_t num_bytes, const char* data) {
     EXPECT_TRUE(data);
 
     received_messages_.push_back(std::string(data, num_bytes));
     if (run_loop_ && received_messages_.size() >= wait_for_message_count_) {
       wait_for_message_count_ = 0;
       run_loop_->Quit();
     }
@@ skipping 294 matching lines @@
 
   socket_1.Send("How do");
   socket_1.Send("you do?");
 
   socket_0.WaitForMessage(2);
   EXPECT_EQ("How do", socket_0.received_messages()[0]);
   EXPECT_EQ("you do?", socket_0.received_messages()[1]);
 }
 
 }  // namespace mojo