Further refine mojo_example_apptests.

mojo/public/cpp/application/lib/application_impl.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/public/cpp/application/application_impl.h"
 
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/lib/service_registry.h"
 #include "mojo/public/cpp/bindings/interface_ptr.h"
 #include "mojo/public/cpp/environment/logging.h"
@@ skipping 36 matching lines @@
     delete *i;
   incoming_service_registries_.clear();
   outgoing_service_registries_.clear();
 }
 
 ApplicationImpl::~ApplicationImpl() {
   ClearConnections();
   delete shell_watch_;
 }
 
-void ApplicationImpl::Initialize(Array<String> args) {
-  MOJO_CHECK(!initialized_);
-  initialized_ = true;
-  args_ = args.To<std::vector<std::string>>();
-  delegate_->Initialize(this);
-}
-
 ApplicationConnection* ApplicationImpl::ConnectToApplication(
     const String& application_url) {
   MOJO_CHECK(initialized_);
   ServiceProviderPtr out_service_provider;
   shell_->ConnectToApplication(application_url,
                                GetProxy(&out_service_provider));
   internal::ServiceRegistry* registry = new internal::ServiceRegistry(
       this, application_url, out_service_provider.Pass());
   if (!delegate_->ConfigureOutgoingConnection(registry)) {
     delete registry;
     return nullptr;
   }
   outgoing_service_registries_.push_back(registry);
   return registry;
 }
 
 bool ApplicationImpl::WaitForInitialize() {
   MOJO_CHECK(!initialized_);
   bool result = shell_.WaitForIncomingMethodCall();
   MOJO_CHECK(initialized_ || !result);
   return result;
 }
 
+ScopedMessagePipeHandle ApplicationImpl::UnbindShell() {
+  return shell_.PassMessagePipe();
+}
+
+void ApplicationImpl::Initialize(Array<String> args) {
+  MOJO_CHECK(!initialized_);
+  initialized_ = true;
+  args_ = args.To<std::vector<std::string>>();
+  delegate_->Initialize(this);
+}
+
 void ApplicationImpl::BindShell(ScopedMessagePipeHandle shell_handle) {
   shell_watch_ = new ShellPtrWatcher(this);
   shell_.Bind(shell_handle.Pass());
   shell_.set_client(this);
   shell_.set_error_handler(shell_watch_);
 }
 
 void ApplicationImpl::AcceptConnection(const String& requestor_url,
                                        ServiceProviderPtr service_provider) {
   internal::ServiceRegistry* registry = new internal::ServiceRegistry(
       this, requestor_url, service_provider.Pass());
   if (!delegate_->ConfigureIncomingConnection(registry)) {
     delete registry;
     return;
   }
   incoming_service_registries_.push_back(registry);
 }
 
 }  // namespace mojo