Remove Client relationship between mojo.Shell/mojo.Application

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 "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 37 matching lines @@
     return registrar_;
   }
   DVLOG(1) << "Waiting for connection.";
   loop.Run();
   return registrar_;
 }
 
 void ExternalApplicationRegistrarConnection::Register(
     const GURL& app_url,
     const std::vector<std::string>& args,
-    base::Callback<void(ShellPtr)> register_complete_callback) {
+    const RegisterCallback& register_callback) {
   DCHECK(!client_socket_);
   registrar_->Register(String::From(app_url), Array<String>::From(args),
-                       register_complete_callback);
+                       register_callback);
 }
 
 void ExternalApplicationRegistrarConnection::OnConnect(const base::Closure& cb,
                                                        int rv) {
   if (rv != net::OK) {
     LOG(ERROR) << "OnConnect called with error: " << net::ErrorToString(rv);
     cb.Run();
     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());
   cb.Run();
 }
 
 }  // namespace shell
 }  // namespace mojo