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

sql/mojo/vfs_unittest.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 <stdint.h>
 #include <memory>
 #include <utility>
 
 #include "base/macros.h"
 #include "components/filesystem/public/interfaces/file_system.mojom.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"
 #include "mojo/util/capture_util.h"
 #include "sql/mojo/mojo_vfs.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/sqlite/sqlite3.h"
 
 namespace std {
 
 // This deleter lets us be safe with sqlite3 objects, which aren't really the
 // structs, but slabs of new uint8_t[size].
 template <>
@@ skipping 23 matching lines @@
   }
 
   scoped_ptr<sqlite3_file> MakeFile() {
     return scoped_ptr<sqlite3_file>(reinterpret_cast<sqlite3_file*>(
         new uint8_t[vfs()->szOsFile]));
   }
 
   void SetUp() override {
     mojo::test::ApplicationTestBase::SetUp();
 
-    application_impl()->ConnectToService("mojo:filesystem", &files_);
+    shell()->ConnectToService("mojo:filesystem", &files_);
 
     filesystem::FileError error = filesystem::FileError::FAILED;
     filesystem::DirectoryPtr directory;
     files_->OpenFileSystem("temp", GetProxy(&directory),
                            binding_.CreateInterfacePtrAndBind(),
                            mojo::Capture(&error));
     ASSERT_TRUE(files_.WaitForIncomingResponse());
     ASSERT_EQ(filesystem::FileError::OK, error);
 
     vfs_.reset(new ScopedMojoFilesystemVFS(std::move(directory)));
@@ skipping 264 matching lines @@
   EXPECT_EQ(SQLITE_OK, rc);
 
   rc = file->pMethods->xFileSize(file.get(), &size);
   EXPECT_EQ(SQLITE_OK, rc);
   EXPECT_EQ(kCharsToThree, size);
 
   file->pMethods->xClose(file.get());
 }
 
 }  // namespace sql