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

services/dart/content_handler_main.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 "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/string_split.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/platform_thread.h"
 #include "base/trace_event/trace_event.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/application/content_handler_factory.h"
 #include "mojo/common/tracing_impl.h"
 #include "mojo/dart/embedder/dart_controller.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/public/cpp/bindings/interface_request.h"
 #include "mojo/services/tracing/interfaces/tracing.mojom.h"
 #include "mojo/services/url_response_disk_cache/interfaces/url_response_disk_cache.mojom.h"
 #include "services/dart/content_handler_app_service_connector.h"
 #include "services/dart/dart_app.h"
 #include "services/dart/dart_tracing.h"
 #include "url/gurl.h"
 
 namespace dart {
@@ skipping 150 matching lines @@
     // TODO(qsr): This has no effect for now, as the tracing infrastructure
     // doesn't allow to trace anything before the tracing app connects to the
     // application.
     TRACE_EVENT0("dart_content_handler", "DartContentHandler::Initialize");
 
     default_strict_ = app->HasArg(kEnableStrictMode);
     content_handler_.set_handler_task_runner(
         base::MessageLoop::current()->task_runner());
     strict_content_handler_.set_handler_task_runner(
         base::MessageLoop::current()->task_runner());
-    app->ConnectToServiceDeprecated("mojo:url_response_disk_cache",
-                                    &url_response_disk_cache_);
+    mojo::ConnectToService(app->shell(), "mojo:url_response_disk_cache",
+                           GetProxy(&url_response_disk_cache_));
     service_connector_ = new ContentHandlerAppServiceConnector(app);
 
     if (app->HasArg(kRunOnMessageLoop)) {
       run_on_message_loop_ = true;
     }
 
     bool enable_observatory = true;
     if (app->HasArg(kDisableObservatory)) {
       enable_observatory = false;
     }
@@ skipping 120 matching lines @@
                     pause_isolates_on_exit));
   }
 }
 
 }  // namespace dart
 
 MojoResult MojoMain(MojoHandle application_request) {
   mojo::ApplicationRunnerChromium runner(new dart::DartContentHandlerApp);
   return runner.Run(application_request);
 }