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

sql/mojo/sql_test_base.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 "sql/mojo/sql_test_base.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <utility>
 
-#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/shell.h"
 #include "mojo/util/capture_util.h"
 #include "sql/mojo/mojo_vfs.h"
 #include "sql/test/test_helpers.h"
 
 using mojo::Capture;
 
 namespace sql {
 
 SQLTestBase::SQLTestBase()
     : binding_(this) {
@@ skipping 108 matching lines @@
     return;
 
   file_ptr->Truncate(0, Capture(&error));
   file_ptr.WaitForIncomingResponse();
   ASSERT_EQ(filesystem::FileError::OK, error);
 }
 
 void SQLTestBase::SetUp() {
   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(),
                           Capture(&error));
   ASSERT_TRUE(files().WaitForIncomingResponse());
   ASSERT_EQ(filesystem::FileError::OK, error);
 
   vfs_.reset(new ScopedMojoFilesystemVFS(std::move(directory)));
   ASSERT_TRUE(db_.Open(db_path()));
 }
 
 void SQLTestBase::TearDown() {
   db_.Close();
   vfs_.reset();
 
   ApplicationTestBase::TearDown();
 }
 
 void SQLTestBase::OnFileSystemShutdown() {
 }
 
 }  // namespace sql