Revert of ApplicationImpl cleanup, part 1:

mojo/application/public/cpp/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/application/public/cpp/application_impl.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 37 matching lines @@
                                  InterfaceRequest<Application> request,
                                  const Closure& termination_closure)
     : delegate_(delegate),
       binding_(this, request.Pass()),
       termination_closure_(termination_closure),
       app_lifetime_helper_(this),
       quit_requested_(false),
       in_destructor_(false),
       weak_factory_(this) {}
 
+void ApplicationImpl::ClearConnections() {
+  // Copy the ServiceRegistryLists because they will be mutated by
+  // ApplicationConnection::CloseConnection.
+  ServiceRegistryList incoming_service_registries(incoming_service_registries_);
+  for (internal::ServiceRegistry* registry : incoming_service_registries)
+    registry->CloseConnection();
+  DCHECK(incoming_service_registries_.empty());
+
+  ServiceRegistryList outgoing_service_registries(outgoing_service_registries_);
+  for (internal::ServiceRegistry* registry : outgoing_service_registries)
+    registry->CloseConnection();
+  DCHECK(outgoing_service_registries_.empty());
+}
+
 ApplicationImpl::~ApplicationImpl() {
   DCHECK(!in_destructor_);
   in_destructor_ = true;
   ClearConnections();
-  app_lifetime_helper_.OnQuit();
+  app_lifetime_helper_.ApplicationTerminated();
 }
 
 ApplicationConnection* ApplicationImpl::ConnectToApplication(
     mojo::URLRequestPtr request,
     CapabilityFilterPtr filter) {
   if (!shell_)
     return nullptr;
   ServiceProviderPtr local_services;
   InterfaceRequest<ServiceProvider> local_request = GetProxy(&local_services);
   ServiceProviderPtr remote_services;
@@ skipping 46 matching lines @@
     binding_.WaitForIncomingMethodCall();
 }
 
 void ApplicationImpl::UnbindConnections(
     InterfaceRequest<Application>* application_request,
     ShellPtr* shell) {
   *application_request = binding_.Unbind();
   shell->Bind(shell_.PassInterface());
 }
 
-void ApplicationImpl::Quit() {
+void ApplicationImpl::Terminate() {
   // We can't quit immediately, since there could be in-flight requests from the
   // shell. So check with it first.
   if (shell_) {
     quit_requested_ = true;
     shell_->QuitApplication();
   } else {
     QuitNow();
   }
 }
 
+void ApplicationImpl::QuitNow() {
+  delegate_->Quit();
+  termination_closure_.Run();
+}
+
 void ApplicationImpl::AcceptConnection(
     const String& requestor_url,
     InterfaceRequest<ServiceProvider> services,
     ServiceProviderPtr exposed_services,
     Array<String> allowed_interfaces,
     const String& url) {
   internal::ServiceRegistry* registry = new internal::ServiceRegistry(
       this, url, requestor_url, exposed_services.Pass(), services.Pass(),
       allowed_interfaces.To<std::set<std::string>>());
   if (!delegate_->ConfigureIncomingConnection(registry)) {
@@ skipping 25 matching lines @@
   // loop. The application might want to continue servicing connections other
   // than the one to the shell.
   bool quit_now = delegate_->OnShellConnectionError();
   if (quit_now)
     QuitNow();
   if (!ptr)
     return;
   shell_ = nullptr;
 }
 
-void ApplicationImpl::ClearConnections() {
-  // Copy the ServiceRegistryLists because they will be mutated by
-  // ApplicationConnection::CloseConnection.
-  ServiceRegistryList incoming_service_registries(incoming_service_registries_);
-  for (internal::ServiceRegistry* registry : incoming_service_registries)
-    registry->CloseConnection();
-  DCHECK(incoming_service_registries_.empty());
-
-  ServiceRegistryList outgoing_service_registries(outgoing_service_registries_);
-  for (internal::ServiceRegistry* registry : outgoing_service_registries)
-    registry->CloseConnection();
-  DCHECK(outgoing_service_registries_.empty());
-}
-
-void ApplicationImpl::QuitNow() {
-  delegate_->Quit();
-  termination_closure_.Run();
-}
-
 }  // namespace mojo