ApplicationConnection lifetime management changes.

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 "base/bind.h"
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "media/base/cdm_config.h"
@@ skipping 41 matching lines @@
   MediaAppTest()
       : renderer_client_binding_(&renderer_client_),
         video_demuxer_stream_(DemuxerStream::VIDEO) {}
   ~MediaAppTest() override {}
 
   void SetUp() override {
     ApplicationTestBase::SetUp();
 
     mojo::URLRequestPtr request = mojo::URLRequest::New();
     request->url = "mojo:media";
-    mojo::ApplicationConnection* connection =
-        application_impl()->ConnectToApplication(request.Pass());
-    connection->SetRemoteServiceProviderConnectionErrorHandler(
+    connection_ = application_impl()->ConnectToApplication(request.Pass());
+    connection_->SetRemoteServiceProviderConnectionErrorHandler(
         base::Bind(&MediaAppTest::ConnectionClosed, base::Unretained(this)));
 
-    connection->ConnectToService(&service_factory_);
+    connection_->ConnectToService(&service_factory_);
     service_factory_->CreateCdm(mojo::GetProxy(&cdm_));
     service_factory_->CreateRenderer(mojo::GetProxy(&renderer_));
 
     run_loop_.reset(new base::RunLoop());
   }
 
   // MOCK_METHOD* doesn't support move only types. Work around this by having
   // an extra method.
   MOCK_METHOD1(OnCdmInitializedInternal, void(bool result));
   void OnCdmInitialized(interfaces::CdmPromiseResultPtr result) {
@@ skipping 37 matching lines @@
   interfaces::ServiceFactoryPtr service_factory_;
   interfaces::ContentDecryptionModulePtr cdm_;
   interfaces::RendererPtr renderer_;
 
   StrictMock<MockRendererClient> renderer_client_;
   mojo::Binding<interfaces::RendererClient> renderer_client_binding_;
 
   StrictMock<MockDemuxerStream> video_demuxer_stream_;
 
  private:
+  scoped_ptr<mojo::ApplicationConnection> connection_;
+
   DISALLOW_COPY_AND_ASSIGN(MediaAppTest);
 };
 
 }  // namespace
 
 // Note: base::RunLoop::RunUntilIdle() does not work well in these tests because
 // even when the loop is idle, we may still have pending events in the pipe.
 
 TEST_F(MediaAppTest, InitializeCdm_Success) {
   InitializeCdm(kClearKey, true);
@@ skipping 24 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