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

components/clipboard/clipboard_apptest.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 <stdint.h>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "components/clipboard/public/interfaces/clipboard.mojom.h"
 #include "mojo/common/common_type_converters.h"
-#include "mojo/shell/public/cpp/application_impl.h"
 #include "mojo/shell/public/cpp/application_test_base.h"
+#include "mojo/shell/public/cpp/shell.h"
 
 using mojo::Array;
 using mojo::Clipboard;
 using mojo::Map;
 using mojo::String;
 
 namespace {
 
 void CopyUint64AndEndRunloop(uint64_t* output,
                              base::RunLoop* run_loop,
@@ skipping 26 matching lines @@
 
 namespace clipboard {
 
 class ClipboardAppTest : public mojo::test::ApplicationTestBase {
  public:
   ClipboardAppTest() : ApplicationTestBase() {}
   ~ClipboardAppTest() override {}
 
   void SetUp() override {
     mojo::test::ApplicationTestBase::SetUp();
-    application_impl()->ConnectToService("mojo:clipboard", &clipboard_);
+    shell()->ConnectToService("mojo:clipboard", &clipboard_);
   }
 
   uint64_t GetSequenceNumber() {
     base::RunLoop run_loop;
     uint64_t sequence_num = 999999;
     clipboard_->GetSequenceNumber(
         Clipboard::Type::COPY_PASTE,
         base::Bind(&CopyUint64AndEndRunloop, &sequence_num, &run_loop));
     run_loop.Run();
     return sequence_num;
@@ skipping 81 matching lines @@
 
   Map<String, Array<uint8_t>> mime_data;
   clipboard_->WriteClipboardData(Clipboard::Type::COPY_PASTE,
                                  std::move(mime_data));
 
   EXPECT_EQ(2ul, GetSequenceNumber());
   EXPECT_FALSE(GetDataOfType(Clipboard::MIME_TYPE_TEXT, &data));
 }
 
 }  // namespace clipboard