Eliminate mojo::Shell client lib class

mojo/shell/tests/package_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 <stddef.h>
 #include <stdint.h>
 
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 20 matching lines @@
 
 using PackageApptest = mojo::test::ApplicationTestBase;
 
 TEST_F(PackageApptest, Basic) {
   std::set<uint32_t> ids;
   {
     // We need to do this to force the shell to read the test app's manifest and
     // register aliases.
     test::mojom::PackageTestServicePtr root_service;
     scoped_ptr<Connection> connection =
-        shell()->Connect("mojo:package_test_package");
+        connector()->Connect("mojo:package_test_package");
     connection->GetInterface(&root_service);
     base::RunLoop run_loop;
     std::string root_name;
     root_service->GetName(base::Bind(&ReceiveName, &root_name, &run_loop));
     run_loop.Run();
     uint32_t id = mojom::Connector::kInvalidApplicationID;
     EXPECT_TRUE(connection->GetRemoteApplicationID(&id));
     ids.insert(id);
   }
 
   {
     // Now subsequent connects to applications provided by the root app will be
     // resolved correctly.
     test::mojom::PackageTestServicePtr service_a;
-    scoped_ptr<Connection> connection = shell()->Connect("mojo:package_test_a");
+    scoped_ptr<Connection> connection =
+        connector()->Connect("mojo:package_test_a");
     connection->GetInterface(&service_a);
     base::RunLoop run_loop;
     std::string a_name;
     service_a->GetName(base::Bind(&ReceiveName, &a_name, &run_loop));
     run_loop.Run();
     EXPECT_EQ("A", a_name);
     uint32_t id = mojom::Connector::kInvalidApplicationID;
     EXPECT_TRUE(connection->GetRemoteApplicationID(&id));
     ids.insert(id);
   }
 
   {
     test::mojom::PackageTestServicePtr service_b;
-    scoped_ptr<Connection> connection = shell()->Connect("mojo:package_test_b");
+    scoped_ptr<Connection> connection =
+        connector()->Connect("mojo:package_test_b");
     connection->GetInterface(&service_b);
     base::RunLoop run_loop;
     std::string b_name;
     service_b->GetName(base::Bind(&ReceiveName, &b_name, &run_loop));
     run_loop.Run();
     EXPECT_EQ("B", b_name);
     uint32_t id = mojom::Connector::kInvalidApplicationID;
     EXPECT_TRUE(connection->GetRemoteApplicationID(&id));
     ids.insert(id);
   }
 }
 
 }  // namespace shell
 }  // namespace mojo