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

mash/browser_driver/browser_driver_application_delegate.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 "mash/browser_driver/browser_driver_application_delegate.h"
 
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "components/mus/public/cpp/event_matcher.h"
 #include "mojo/shell/public/cpp/application_connection.h"
-#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/shell.h"
 
 namespace mash {
 namespace browser_driver {
 namespace {
 
 enum class Accelerator : uint32_t {
   NewWindow,
   NewTab,
   NewIncognitoWindow,
 };
@@ skipping 15 matching lines @@
      mus::mojom::kEventFlagControlDown | mus::mojom::kEventFlagShiftDown},
 };
 
 void AssertTrue(bool success) {
   DCHECK(success);
 }
 
 }  // namespace
 
 BrowserDriverApplicationDelegate::BrowserDriverApplicationDelegate()
-    : app_(nullptr),
+    : shell_(nullptr),
       binding_(this) {}
 
 BrowserDriverApplicationDelegate::~BrowserDriverApplicationDelegate() {}
 
-void BrowserDriverApplicationDelegate::Initialize(mojo::ApplicationImpl* app) {
-  app_ = app;
+void BrowserDriverApplicationDelegate::Initialize(mojo::Shell* shell,
+                                                  const std::string& url,
+                                                  uint32_t id) {
+  shell_ = shell;
   AddAccelerators();
 }
 
 bool BrowserDriverApplicationDelegate::AcceptConnection(
     mojo::ApplicationConnection* connection) {
   return true;
 }
 
 void BrowserDriverApplicationDelegate::OnAccelerator(
     uint32_t id, mus::mojom::EventPtr event) {
   switch (static_cast<Accelerator>(id)) {
     case Accelerator::NewWindow:
     case Accelerator::NewTab:
     case Accelerator::NewIncognitoWindow:
-      app_->ConnectToApplication("exe:chrome");
+      shell_->ConnectToApplication("exe:chrome");
       // TODO(beng): have Chrome export a service that allows it to be driven by
       //             this driver, e.g. to open new tabs, incognito windows, etc.
       break;
     default:
       NOTREACHED();
       break;
   }
 }
 
 void BrowserDriverApplicationDelegate::AddAccelerators() {
   // TODO(beng): find some other way to get the window manager. I don't like
   //             having to specify it by URL because it may differ per display.
   mus::mojom::AcceleratorRegistrarPtr registrar;
-  app_->ConnectToService("mojo:desktop_wm", &registrar);
+  shell_->ConnectToService("mojo:desktop_wm", &registrar);
 
   if (binding_.is_bound())
     binding_.Unbind();
   registrar->SetHandler(binding_.CreateInterfacePtrAndBind());
   // If the window manager restarts, the handler pipe will close and we'll need
   // to re-add our accelerators when the window manager comes back up.
   binding_.set_connection_error_handler(
       base::Bind(&BrowserDriverApplicationDelegate::AddAccelerators,
                  base::Unretained(this)));
 
   for (const AcceleratorSpec& spec : g_spec) {
     registrar->AddAccelerator(
         static_cast<uint32_t>(spec.id),
         mus::CreateKeyMatcher(spec.keyboard_code, spec.event_flags),
         base::Bind(&AssertTrue));
   }
 }
 
 }  // namespace browser_driver
 }  // namespace main