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

mojo/shell/application_manager_apptest_target.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 "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "mojo/shell/application_manager_apptests.mojom.h"
 #include "mojo/shell/public/cpp/application_connection.h"
 #include "mojo/shell/public/cpp/application_delegate.h"
-#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/shell.h"
 #include "mojo/shell/runner/child/test_native_main.h"
 #include "mojo/shell/runner/init.h"
 
 using mojo::shell::test::mojom::CreateInstanceForHandleTestPtr;
 
 namespace {
 
 class TargetApplicationDelegate : public mojo::ApplicationDelegate {
  public:
   TargetApplicationDelegate() {}
   ~TargetApplicationDelegate() override {}
 
  private:
   // mojo::ApplicationDelegate:
-  void Initialize(mojo::ApplicationImpl* app) override {
+  void Initialize(mojo::Shell* shell, const std::string& url,
+                  uint32_t id) override {
     CreateInstanceForHandleTestPtr service;
-    app->ConnectToService("mojo:mojo_shell_apptests", &service);
-    service->SetTargetID(app->id());
-  }
-  bool AcceptConnection(
-      mojo::ApplicationConnection* connection) override {
-    return true;
+    shell->ConnectToService("mojo:mojo_shell_apptests", &service);
+    service->SetTargetID(id);
   }
 
   DISALLOW_COPY_AND_ASSIGN(TargetApplicationDelegate);
 };
 
 }  // namespace
 
 int main(int argc, char** argv) {
   base::AtExitManager at_exit;
   base::CommandLine::Init(argc, argv);
 
   mojo::shell::InitializeLogging();
 
   TargetApplicationDelegate delegate;
   return mojo::shell::TestNativeMain(&delegate);
 }