Eliminate mojo::Shell client lib class

components/leveldb/leveldb_apptest.cc

 // Copyright 2016 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/macros.h"
 #include "components/filesystem/public/interfaces/directory.mojom.h"
 #include "components/filesystem/public/interfaces/file_system.mojom.h"
 #include "components/filesystem/public/interfaces/types.mojom.h"
 #include "components/leveldb/public/interfaces/leveldb.mojom.h"
 #include "mojo/common/common_type_converters.h"
@@ skipping 10 matching lines @@
 
 class LevelDBApptest : public mojo::test::ApplicationTestBase {
  public:
   LevelDBApptest() {}
   ~LevelDBApptest() override {}
 
  protected:
   // Overridden from mojo::test::ApplicationTestBase:
   void SetUp() override {
     ApplicationTestBase::SetUp();
-    shell()->ConnectToInterface("mojo:filesystem", &files_);
-    shell()->ConnectToInterface("mojo:leveldb", &leveldb_);
+    connector()->ConnectToInterface("mojo:filesystem", &files_);
+    connector()->ConnectToInterface("mojo:leveldb", &leveldb_);
   }
 
   // Note: This has an out parameter rather than returning the |DirectoryPtr|,
   // since |ASSERT_...()| doesn't work with return values.
   void GetUserDataDir(filesystem::DirectoryPtr* directory) {
     FileError error = FileError::FAILED;
     files()->OpenPersistentFileSystem(GetProxy(directory),
                                       mojo::Capture(&error));
     ASSERT_TRUE(files().WaitForIncomingResponse());
     ASSERT_EQ(FileError::OK, error);
@@ skipping 243 matching lines @@
   database->GetFromSnapshot(
       invalid_snapshot,
       mojo::Array<uint8_t>::From(std::string("key")),
       Capture(&error, &value));
   ASSERT_TRUE(database.WaitForIncomingResponse());
   EXPECT_EQ(DatabaseError::INVALID_ARGUMENT, error);
 }
 
 }  // namespace
 }  // namespace leveldb