Roll Mojo to b88737ed62969ce3203085748f0d53ff4f09ba5b.

mojo/services/network/http_server_apptest.cc

Index: mojo/services/network/http_server_apptest.cc
diff --git a/mojo/services/network/http_server_apptest.cc b/mojo/services/network/http_server_apptest.cc
index 4ad7ca4724924ab77d0e6bf5c206f96401b4010f..e493f89b4ed67ad96f9bfd08daaae9c90846d8fc 100644
--- a/mojo/services/network/http_server_apptest.cc
+++ b/mojo/services/network/http_server_apptest.cc
@@ -38,7 +38,7 @@ 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);
@@ -372,7 +372,7 @@ class WebSocketClientImpl : public WebSocketClient {
   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) {