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

device/devices_app/devices_app.cc

 // Copyright 2015 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 "device/devices_app/devices_app.h"
 
 #include <stdint.h>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/sequenced_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/thread.h"
 #include "base/time/time.h"
 #include "device/core/device_client.h"
 #include "device/devices_app/usb/device_manager_impl.h"
 #include "device/usb/usb_service.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/shell/public/cpp/application_connection.h"
-#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/shell.h"
 #include "url/gurl.h"
 
 namespace device {
 
 namespace {
 
 // The number of seconds to wait without any bound DeviceManagers before
 // exiting the app.
 const int64_t kIdleTimeoutInSeconds = 10;
 
@@ skipping 35 matching lines @@
 
   ~USBServiceInitializer() {}
 
  private:
   scoped_ptr<AppDeviceClient> app_device_client_;
   base::Thread blocking_thread_;
 
   DISALLOW_COPY_AND_ASSIGN(USBServiceInitializer);
 };
 
-DevicesApp::DevicesApp()
-    : app_impl_(nullptr), active_device_manager_count_(0) {}
+DevicesApp::DevicesApp() : shell_(nullptr), active_device_manager_count_(0) {}
 
 DevicesApp::~DevicesApp() {
 }
 
-void DevicesApp::Initialize(mojo::ApplicationImpl* app) {
-  app_impl_ = app;
+void DevicesApp::Initialize(mojo::Shell* shell,
+                            const std::string& url,
+                            uint32_t id) {
+  shell_ = shell;
   service_initializer_.reset(new USBServiceInitializer);
   StartIdleTimer();
 }
 
 bool DevicesApp::AcceptConnection(mojo::ApplicationConnection* connection) {
   connection->AddService<usb::DeviceManager>(this);
   return true;
 }
 
 void DevicesApp::Quit() {
   service_initializer_.reset();
-  app_impl_ = nullptr;
+  shell_ = nullptr;
 }
 
 void DevicesApp::Create(mojo::ApplicationConnection* connection,
                         mojo::InterfaceRequest<usb::DeviceManager> request) {
   // Bind the new device manager to the connecting application's permission
   // provider.
   usb::PermissionProviderPtr permission_provider;
   connection->ConnectToService(&permission_provider);
 
   // Owned by its message pipe.
@@ skipping 10 matching lines @@
   DCHECK_GE(active_device_manager_count_, 0u);
   active_device_manager_count_--;
   if (active_device_manager_count_ == 0) {
     // If the last DeviceManager connection has been dropped, kick off an idle
     // timeout to shut ourselves down.
     StartIdleTimer();
   }
 }
 
 void DevicesApp::StartIdleTimer() {
-  // Passing unretained |app_impl_| is safe here because |app_impl_| is
+  // Passing unretained |shell_| is safe here because |shell_| is
   // guaranteed to outlive |this|, and the callback is canceled if |this| is
   // destroyed.
-  idle_timeout_callback_.Reset(base::Bind(&mojo::ApplicationImpl::Quit,
-                                          base::Unretained(app_impl_)));
+  idle_timeout_callback_.Reset(
+      base::Bind(&mojo::Shell::Quit, base::Unretained(shell_)));
   base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
       FROM_HERE, idle_timeout_callback_.callback(),
       base::TimeDelta::FromSeconds(kIdleTimeoutInSeconds));
 }
 
 }  // namespace device