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

services/nacl/sfi/content_handler_main.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/files/file_util.h"
 #include "base/files/scoped_file.h"
 #include "base/message_loop/message_loop.h"
 #include "build/build_config.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/application/content_handler_factory.h"
 #include "mojo/data_pipe_utils/data_pipe_utils.h"
 #include "mojo/message_pump/message_pump_mojo.h"
 #include "mojo/nacl/sfi/nacl_bindings/monacl_sel_main.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/network/interfaces/network_service.mojom.h"
 #include "mojo/services/network/interfaces/url_loader.mojom.h"
 #include "native_client/src/public/nacl_desc.h"
 #include "url/gurl.h"
 
 namespace nacl {
 namespace content_handler {
 
 namespace {
 base::ScopedFILE TempFileForURL(mojo::URLLoaderPtr& url_loader,
@@ skipping 46 matching lines @@
                            public mojo::ContentHandlerFactory::Delegate {
  public:
   NaClContentHandler() : content_handler_factory_(this) {}
 
  private:
   // Overridden from ApplicationDelegate:
   void Initialize(mojo::ApplicationImpl* app) override {
     url_ = GURL(app->url());
 
     mojo::NetworkServicePtr network_service;
-    app->ConnectToServiceDeprecated("mojo:network_service", &network_service);
+    mojo::ConnectToService(app->shell(), "mojo:network_service",
+                           GetProxy(&network_service));
 
     network_service->CreateURLLoader(GetProxy(&url_loader_));
   }
 
   void LoadIRT(mojo::URLLoaderPtr& url_loader) {
     // TODO(ncbray): support other architectures.
     GURL irt_url;
 #if defined(ARCH_CPU_X86_64)
     irt_url = url_.Resolve("irt_x64/irt_mojo.nexe");
 #else
@@ skipping 51 matching lines @@
 };
 
 }  // namespace content_handler
 }  // namespace nacl
 
 MojoResult MojoMain(MojoHandle application_request) {
   mojo::ApplicationRunnerChromium runner(
       new nacl::content_handler::NaClContentHandler());
   return runner.Run(application_request);
 }