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

services/debugger/debugger.cc

 // Copyright 2014 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 <algorithm>
 
 #include "base/bind.h"
 #include "base/debug/profiler.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/data_pipe_utils/data_pipe_utils.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
+#include "mojo/public/cpp/application/connect.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/services/http_server/cpp/http_server_util.h"
 #include "mojo/services/http_server/interfaces/http_server.mojom.h"
 #include "mojo/services/http_server/interfaces/http_server_factory.mojom.h"
 #include "mojo/services/network/interfaces/net_address.mojom.h"
 #include "mojo/services/tracing/interfaces/tracing.mojom.h"
 #include "services/debugger/trace_collector.h"
 
 // Debugger is a Mojo application that exposes an http server and talks to other
 // mojo apps in response to url requests received by the server. Supported
@@ skipping 14 matching lines @@
     app_ = app;
 
     // Format: --args-for="app_url command_port"
     if (app->args().size() < 2) {
       LOG(ERROR) << "--args-for required to specify command_port";
       mojo::ApplicationImpl::Terminate();
       return;
     }
     base::StringToUint(app->args()[1], &command_port_);
     http_server::HttpServerFactoryPtr http_server_factory;
-    app->ConnectToServiceDeprecated("mojo:http_server", &http_server_factory);
+    mojo::ConnectToService(app->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 = command_port_;
@@ skipping 52 matching lines @@
     // TODO(eseidel): We should orderly shutdown once mojo can.
     exit(0);
   }
 
   void StartTracing(const HandleRequestCallback& callback) {
     if (is_tracing_) {
       Error(callback, "Already tracing. Use stop_tracing to stop.\n");
       return;
     }
 
-    if (!tracing_)
-      app_->ConnectToServiceDeprecated("mojo:tracing", &tracing_);
+    if (!tracing_) {
+      mojo::ConnectToService(app_->shell(), "mojo:tracing",
+                             GetProxy(&tracing_));
+    }
     is_tracing_ = true;
     mojo::DataPipe pipe;
     tracing_->Start(pipe.producer_handle.Pass(), mojo::String("*"));
     trace_collector_.reset(new TraceCollector(pipe.consumer_handle.Pass()));
     Respond(callback, "Starting trace (type 'stop_tracing' to stop)\n");
   }
 
   void StopTracing(const HandleRequestCallback& callback) {
     if (!is_tracing_) {
       Error(callback, "Not tracing yet. Use start_tracing to start.\n");
@@ skipping 24 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(Debugger);
 };
 
 }  // namespace debugger
 
 MojoResult MojoMain(MojoHandle application_request) {
   mojo::ApplicationRunnerChromium runner(new debugger::Debugger);
   runner.set_message_loop_type(base::MessageLoop::TYPE_IO);
   return runner.Run(application_request);
 }