ApplicationImpl::ConnectToServiceDeprecated() -> mojo::ConnectToService() conversion, part 3.

shell/shell_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/base_paths.h"
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
@@ skipping 62 matching lines @@
 
 class ShellHTTPAppTest : public ShellAppTest {
  public:
   ShellHTTPAppTest() {}
   ~ShellHTTPAppTest() override {}
 
  protected:
   void SetUp() override {
     ShellAppTest::SetUp();
 
-    application_impl()->ConnectToServiceDeprecated("mojo:http_server",
-                                                   &http_server_factory_);
+    mojo::ConnectToService(application_impl()->shell(), "mojo:http_server",
+                           GetProxy(&http_server_factory_));
 
     mojo::NetAddressPtr local_address(mojo::NetAddress::New());
     local_address->family = mojo::NetAddressFamily::IPV4;
     local_address->ipv4 = mojo::NetAddressIPv4::New();
     local_address->ipv4->addr.resize(4);
     local_address->ipv4->addr[0] = 127;
     local_address->ipv4->addr[1] = 0;
     local_address->ipv4->addr[2] = 0;
     local_address->ipv4->addr[3] = 1;
     local_address->ipv4->port = 0;
@@ skipping 17 matching lines @@
   scoped_ptr<GetHandler> handler_;
   uint16_t port_;
 
  private:
   MOJO_DISALLOW_COPY_AND_ASSIGN(ShellHTTPAppTest);
 };
 
 // Test that we can load apps over http.
 TEST_F(ShellHTTPAppTest, Http) {
   PingablePtr pingable;
-  application_impl()->ConnectToServiceDeprecated(GetURL("app"), &pingable);
+  mojo::ConnectToService(application_impl()->shell(), GetURL("app"),
+                         GetProxy(&pingable));
   pingable->Ping("hello",
                  [this](const String& app_url, const String& connection_url,
                         const String& message) {
                    EXPECT_EQ(GetURL("app"), app_url);
                    EXPECT_EQ(GetURL("app"), connection_url);
                    EXPECT_EQ("hello", message);
                    base::MessageLoop::current()->Quit();
                  });
   base::RunLoop().Run();
 }
 
 // Test that redirects work.
 // TODO(aa): Test that apps receive the correct URL parameters.
 TEST_F(ShellHTTPAppTest, Redirect) {
   PingablePtr pingable;
-  application_impl()->ConnectToServiceDeprecated(GetURL("redirect"), &pingable);
+  mojo::ConnectToService(application_impl()->shell(), GetURL("redirect"),
+                         GetProxy(&pingable));
   pingable->Ping("hello",
                  [this](const String& app_url, const String& connection_url,
                         const String& message) {
                    EXPECT_EQ(GetURL("app"), app_url);
                    EXPECT_EQ(GetURL("app"), connection_url);
                    EXPECT_EQ("hello", message);
                    base::MessageLoop::current()->Quit();
                  });
   base::RunLoop().Run();
 }
 
 // Test that querystring is not considered when resolving http applications.
 // TODO(aa|qsr): Fix this test on Linux ASAN http://crbug.com/463662
 #if defined(ADDRESS_SANITIZER)
 #define MAYBE_QueryHandling DISABLED_QueryHandling
 #else
 #define MAYBE_QueryHandling QueryHandling
 #endif  // ADDRESS_SANITIZER
 TEST_F(ShellHTTPAppTest, MAYBE_QueryHandling) {
   PingablePtr pingable1;
   PingablePtr pingable2;
-  application_impl()->ConnectToServiceDeprecated(GetURL("app?foo"), &pingable1);
-  application_impl()->ConnectToServiceDeprecated(GetURL("app?bar"), &pingable2);
+  mojo::ConnectToService(application_impl()->shell(), GetURL("app?foo"),
+                         GetProxy(&pingable1));
+  mojo::ConnectToService(application_impl()->shell(), GetURL("app?bar"),
+                         GetProxy(&pingable2));
 
   int num_responses = 0;
   auto callbacks_builder = [this, &num_responses](int query_index) {
     return [this, &num_responses, query_index](const String& app_url,
                                                const String& connection_url,
                                                const String& message) {
       EXPECT_EQ(GetURL("app"), app_url);
       EXPECT_EQ("hello", message);
       if (query_index == 1) {
         EXPECT_EQ(GetURL("app?foo"), connection_url);
       } else if (query_index == 2) {
         EXPECT_EQ(GetURL("app?bar"), connection_url);
       } else {
         CHECK(false);
       }
       ++num_responses;
       if (num_responses == 2)
         base::MessageLoop::current()->Quit();
     };
   };
   pingable1->Ping("hello", callbacks_builder(1));
   pingable2->Ping("hello", callbacks_builder(2));
   base::RunLoop().Run();
 }
 
 // mojo: URLs can have querystrings too
 TEST_F(ShellAppTest, MojoURLQueryHandling) {
   PingablePtr pingable;
-  application_impl()->ConnectToServiceDeprecated("mojo:pingable_app?foo",
-                                                 &pingable);
+  mojo::ConnectToService(application_impl()->shell(), "mojo:pingable_app?foo",
+                         GetProxy(&pingable));
   auto callback = [](const String& app_url, const String& connection_url,
                      const String& message) {
     EXPECT_TRUE(base::EndsWith(app_url.To<base::StringPiece>(),
                                "/pingable_app.mojo",
                                base::CompareCase::SENSITIVE));
     EXPECT_EQ(app_url.To<std::string>() + "?foo", connection_url);
     EXPECT_EQ("hello", message);
     base::MessageLoop::current()->Quit();
   };
   pingable->Ping("hello", callback);
@@ skipping 38 matching lines @@
   }
 
   // The first one should still work.
   {
     SCOPED_TRACE("app_connector1 again");
     TestApplicationConnector(app_connector1.get());
   }
 }
 
 }  // namespace