Eliminate mojo::Shell client lib class

media/mojo/services/media_apptest.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 <stdint.h>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/macros.h"
@@ skipping 41 matching lines @@
 class MediaAppTest : public mojo::test::ApplicationTestBase {
  public:
   MediaAppTest()
       : renderer_client_binding_(&renderer_client_),
         video_demuxer_stream_(DemuxerStream::VIDEO) {}
   ~MediaAppTest() override {}
 
   void SetUp() override {
     ApplicationTestBase::SetUp();
 
-    connection_ = shell()->Connect("mojo:media");
+    connection_ = connector()->Connect("mojo:media");
     connection_->SetRemoteInterfaceProviderConnectionErrorHandler(
         base::Bind(&MediaAppTest::ConnectionClosed, base::Unretained(this)));
 
     connection_->GetInterface(&service_factory_);
     service_factory_->CreateCdm(mojo::GetProxy(&cdm_));
     service_factory_->CreateRenderer(mojo::GetProxy(&renderer_));
 
     run_loop_.reset(new base::RunLoop());
   }
 
@@ skipping 89 matching lines @@
   // close the connection.
   EXPECT_CALL(*this, ConnectionClosed())
       .Times(Exactly(1))
       .WillOnce(Invoke(run_loop_.get(), &base::RunLoop::Quit));
   service_factory_.reset();
 
   run_loop_->Run();
 }
 
 }  // namespace media