Monet: Roll mojo_sdk to 3762c8c0b74b48b00786a42fca8f7db7f761935f.

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"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "mojo/data_pipe_utils/data_pipe_utils.h"
 #include "mojo/services/network/interfaces/http_connection.mojom.h"
 #include "mojo/services/network/interfaces/http_message.mojom.h"
 #include "mojo/services/network/interfaces/http_server.mojom.h"
 #include "mojo/services/network/interfaces/net_address.mojom.h"
 #include "mojo/services/network/interfaces/network_service.mojom.h"
 #include "mojo/services/network/interfaces/web_socket.mojom.h"
 #include "mojo/services/network/net_address_type_converters.h"
 #include "mojo/services/network/web_socket_read_queue.h"
 #include "mojo/services/network/web_socket_write_queue.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_completion_callback.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_util.h"
 #include "net/socket/tcp_client_socket.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/mojo/src/mojo/public/cpp/application/application_connection.h"
 #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"
+#include "third_party/mojo/src/mojo/public/cpp/application/connect.h"
 
 namespace mojo {
 namespace {
 
 const int kMaxExpectedResponseLength = 2048;
 
 NetAddressPtr GetLocalHostWithAnyPort() {
   NetAddressPtr addr(NetAddress::New());
   addr->family = NetAddressFamily::IPV4;
   addr->ipv4 = NetAddressIPv4::New();
@@ skipping 503 matching lines @@
  public:
   HttpServerAppTest() : message_loop_(base::MessageLoop::TYPE_IO) {}
   ~HttpServerAppTest() override {}
 
  protected:
   bool ShouldCreateDefaultRunLoop() override { return false; }
 
   void SetUp() override {
     ApplicationTestBase::SetUp();
 
-    ApplicationConnection* connection =
-        application_impl()->ConnectToApplication("mojo:network_service");
-    connection->ConnectToService(&network_service_);
+    ConnectToService(application_impl()->shell(), "mojo:network_service",
+                     GetProxy(&network_service_));
   }
 
   void CreateHttpServer(InterfaceHandle<HttpServerDelegate> delegate,
                         NetAddressPtr* out_bound_to) {
     network_service_->CreateHttpServer(
         GetLocalHostWithAnyPort(), delegate.Pass(),
         [out_bound_to](NetworkErrorPtr result, NetAddressPtr bound_to) {
           ASSERT_EQ(net::OK, result->code);
           EXPECT_NE(0u, bound_to->ipv4->port);
           *out_bound_to = bound_to.Pass();
@@ skipping 113 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