Eliminate mojo::Shell client lib class

components/filesystem/files_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 "components/filesystem/files_test_base.h"
 
 #include <utility>
 
 #include "components/filesystem/public/interfaces/directory.mojom.h"
 #include "components/filesystem/public/interfaces/types.mojom.h"
-#include "mojo/shell/public/cpp/shell.h"
+#include "mojo/shell/public/cpp/connector.h"
 #include "mojo/util/capture_util.h"
 
 namespace filesystem {
 
 FilesTestBase::FilesTestBase() {
 }
 
 FilesTestBase::~FilesTestBase() {
 }
 
 void FilesTestBase::SetUp() {
   ApplicationTestBase::SetUp();
-  shell()->ConnectToInterface("mojo:filesystem", &files_);
+  connector()->ConnectToInterface("mojo:filesystem", &files_);
 }
 
 void FilesTestBase::GetTemporaryRoot(DirectoryPtr* directory) {
   FileError error = FileError::FAILED;
   files()->OpenTempDirectory(GetProxy(directory), mojo::Capture(&error));
   ASSERT_TRUE(files().WaitForIncomingResponse());
   ASSERT_EQ(FileError::OK, error);
 }
 
 }  // namespace filesystem