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

apps/benchmark/benchmark_app.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 <memory>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "apps/benchmark/event.h"
 #include "apps/benchmark/measurements.h"
 #include "apps/benchmark/run_args.h"
 #include "apps/benchmark/trace_collector_client.h"
 #include "base/bind.h"
 #include "base/files/file_util.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/time/time.h"
 #include "base/trace_event/trace_event.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/application/application_connection.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/services/tracing/interfaces/tracing.mojom.h"
 
 namespace benchmark {
 namespace {
 
 class BenchmarkApp : public mojo::ApplicationDelegate,
                      public TraceCollectorClient::Receiver {
  public:
   BenchmarkApp() {}
   ~BenchmarkApp() override {}
@@ skipping 11 matching lines @@
     std::string categories_str;
     if (args_.write_output_file) {
       categories_str = "*";
     } else {
       categories_str = ComputeCategoriesStr();
     }
 
     // Connect to trace collector, which will fetch the trace events produced by
     // the app being benchmarked.
     tracing::TraceCollectorPtr trace_collector;
-    app->ConnectToServiceDeprecated("mojo:tracing", &trace_collector);
+    mojo::ConnectToService(app->shell(), "mojo:tracing",
+                           GetProxy(&trace_collector));
     trace_collector_client_.reset(
         new TraceCollectorClient(this, trace_collector.Pass()));
     trace_collector_client_->Start(categories_str);
 
     // Start tracing the application with 1 sec of delay.
     base::MessageLoop::current()->PostDelayedTask(
         FROM_HERE, base::Bind(&BenchmarkApp::StartTracedApplication,
                               base::Unretained(this), app),
         base::TimeDelta::FromSeconds(1));
   }
@@ skipping 86 matching lines @@
 };
 }  // namespace
 }  // namespace benchmark
 
 MojoResult MojoMain(MojoHandle application_request) {
   mojo::ApplicationRunnerChromium runner(new benchmark::BenchmarkApp);
   auto ret = runner.Run(application_request);
   fflush(nullptr);
   return ret;
 }