Change ExternalApplicationRegistrar::Register API

mojo/shell/external_application_registrar_connection.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 "mojo/shell/external_application_registrar_connection.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 35 matching lines @@
   if (rv != net::ERR_IO_PENDING) {
     DVLOG(1) << "Connect returning immediately: " << net::ErrorToString(rv);
     OnConnect(callback, rv);
     return;
   }
   DVLOG(1) << "Waiting for connection.";
 }
 
 void ExternalApplicationRegistrarConnection::Register(
     const GURL& app_url,
-    ShellPtr* shell,
-    base::Closure register_complete_callback) {
+    base::Callback<void(ShellPtr)> register_complete_callback) {
   DCHECK(!client_socket_);
-  registrar_->Register(
-      String::From(app_url), Get(shell), register_complete_callback);
+  registrar_->Register(String::From(app_url), register_complete_callback);
 }
 
 void ExternalApplicationRegistrarConnection::OnConnect(
     net::CompletionCallback callback,
     int rv) {
   DVLOG(1) << "OnConnect called: " << net::ErrorToString(rv);
   if (rv != net::OK) {
     callback.Run(rv);
     return;
   }
 
   mojo::ScopedMessagePipeHandle ptr_message_pipe_handle =
       channel_init_.Init(client_socket_->ReleaseConnectedSocket(),
                          base::MessageLoopProxy::current());
   CHECK(ptr_message_pipe_handle.is_valid());
   client_socket_.reset();  // This is dead now, ensure it can't be reused.
 
   registrar_.Bind(ptr_message_pipe_handle.Pass());
   callback.Run(rv);
 }
 
 }  // namespace shell
 }  // namespace mojo