Extract shell methods from ApplicationImpl into a base class, and pass this to Initialize() instead.

mojo/shell/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 <algorithm>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "mojo/converters/network/network_type_converters.h"
@@ skipping 30 matching lines @@
     : ApplicationImpl(delegate,
                       std::move(request),
                       base::Bind(&DefaultTerminationClosure)) {}
 
 ApplicationImpl::ApplicationImpl(
     ApplicationDelegate* delegate,
     InterfaceRequest<shell::mojom::Application> request,
     const Closure& termination_closure)
     : delegate_(delegate),
       binding_(this, std::move(request)),
-      id_(shell::mojom::Shell::kInvalidApplicationID),
       termination_closure_(termination_closure),
       app_lifetime_helper_(this),
       quit_requested_(false),
       weak_factory_(this) {}
 
 ApplicationImpl::~ApplicationImpl() {
   app_lifetime_helper_.OnQuit();
 }
 
+void ApplicationImpl::WaitForInitialize() {
+  DCHECK(!shell_.is_bound());
+  binding_.WaitForIncomingMethodCall();
+}
+
 scoped_ptr<ApplicationConnection> ApplicationImpl::ConnectToApplication(
     const std::string& url) {
   ConnectParams params(url);
   params.set_filter(CreatePermissiveCapabilityFilter());
   return ConnectToApplication(&params);
 }
 
 scoped_ptr<ApplicationConnection>
     ApplicationImpl::ConnectToApplication(ConnectParams* params) {
   if (!shell_)
@@ skipping 16 matching lines @@
       application_url, application_url,
       shell::mojom::Shell::kInvalidApplicationID, std::move(remote_services),
       std::move(local_request), allowed));
   shell_->ConnectToApplication(std::move(request),
                                std::move(remote_services_proxy),
                                std::move(local_services), params->TakeFilter(),
                                registry->GetConnectToApplicationCallback());
   return std::move(registry);
 }
 
-void ApplicationImpl::WaitForInitialize() {
-  DCHECK(!shell_.is_bound());
-  binding_.WaitForIncomingMethodCall();
-}
-
 void ApplicationImpl::Quit() {
   // 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();
   }
 }
 
+scoped_ptr<AppRefCount> ApplicationImpl::CreateAppRefCount() {
+  return app_lifetime_helper_.CreateAppRefCount();
+}
+
 void ApplicationImpl::Initialize(shell::mojom::ShellPtr shell,
                                  const mojo::String& url,
                                  uint32_t id) {
   shell_ = std::move(shell);
   shell_.set_connection_error_handler([this]() { OnConnectionError(); });
-  url_ = url;
-  id_ = id;
-  delegate_->Initialize(this);
+  delegate_->Initialize(this, url, id);
 }
 
 void ApplicationImpl::AcceptConnection(
     const String& requestor_url,
     uint32_t requestor_id,
     InterfaceRequest<ServiceProvider> services,
     ServiceProviderPtr exposed_services,
     Array<String> allowed_interfaces,
     const String& url) {
   scoped_ptr<ApplicationConnection> registry(new internal::ServiceRegistry(
@@ skipping 49 matching lines @@
 shell::mojom::CapabilityFilterPtr CreatePermissiveCapabilityFilter() {
   shell::mojom::CapabilityFilterPtr filter(
       shell::mojom::CapabilityFilter::New());
   Array<String> all_interfaces;
   all_interfaces.push_back("*");
   filter->filter.insert("*", std::move(all_interfaces));
   return filter;
 }
 
 }  // namespace mojo