Monet: Roll mojo_sdk to 3762c8c0b74b48b00786a42fca8f7db7f761935f.

mojo/services/network/host_resolver_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/bind.h"
 #include "base/lazy_instance.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "mojo/message_pump/message_pump_mojo.h"
 #include "mojo/services/network/interfaces/network_service.mojom.h"
 #include "mojo/services/network/interfaces/net_address.mojom.h"
 #include "mojo/services/network/interfaces/host_resolver.mojom.h"
 #include "net/base/net_errors.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"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/callback.h"
 
 namespace mojo {
 
 class HostResolverTestHelper {
  public:
   static bool Match4(uint8_t* expected_ipv4, const NetAddressPtr& address) {
     EXPECT_EQ(NetAddressFamily::IPV4, address->family);
     for (size_t i = 0; i < address->ipv4->addr.size(); i++) {
       if (address->ipv4->addr[i] != expected_ipv4[i]) {
@@ skipping 38 matching lines @@
 
 class HostResolverImplTest : public test::ApplicationTestBase {
  public:
   HostResolverImplTest() {
   }
 
  protected:
   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_));
   }
 
   NetworkServicePtr network_service_;
 
   DISALLOW_COPY_AND_ASSIGN(HostResolverImplTest);
 };
 
 TEST_F(HostResolverImplTest, Create) {
   HostResolverPtr host_resolver;
   network_service_->CreateHostResolver(GetProxy(&host_resolver));
@@ skipping 42 matching lines @@
 
 TEST_F(HostResolverImplTest, DropOnFloor) {
   HostResolverPtr host_resolver;
   network_service_->CreateHostResolver(GetProxy(&host_resolver));
   host_resolver->GetHostAddresses("localhost", NetAddressFamily::IPV4,
       [](NetworkErrorPtr error, Array<NetAddressPtr> addresses) {
   });
 }
 
 }  // namespace mojo