Eliminate mojo::Shell client lib class

mojo/shell/tests/package_apptest.cc

Index: mojo/shell/tests/package_apptest.cc
diff --git a/mojo/shell/tests/package_apptest.cc b/mojo/shell/tests/package_apptest.cc
index ecdb0d9a7faeb8afbb454c371ab78dcf60b4c285..8b739ade12bdfea5f996996953f740aa471896fc 100644
--- a/mojo/shell/tests/package_apptest.cc
+++ b/mojo/shell/tests/package_apptest.cc
@@ -38,7 +38,7 @@ TEST_F(PackageApptest, Basic) {
     // 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;
@@ -53,7 +53,8 @@ TEST_F(PackageApptest, Basic) {
     // 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;
@@ -67,7 +68,8 @@ TEST_F(PackageApptest, Basic) {
 
   {
     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;