Take advantage of the new Pass() machinery on scoped_ptr{,_malloc}.

media/base/pipeline_impl_unittest.cc

 // Copyright (c) 2011 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 <string>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/stl_util.h"
 #include "base/threading/simple_thread.h"
@@ skipping 187 matching lines @@
   }
   // But some tests require different statuses in build & Start.
   void InitializePipeline(PipelineStatus build_status,
                           PipelineStatus start_status) {
     // Expect an initialization callback.
     EXPECT_CALL(callbacks_, OnStart(start_status));
 
     pipeline_->Start(mocks_->filter_collection(true,
                                                true,
                                                true,
-                                               build_status),
+                                               build_status).Pass(),
                      "",
                      base::Bind(&CallbackHelper::OnStart,
                                 base::Unretained(&callbacks_)));
 
     message_loop_.RunAllPending();
   }
 
   void CreateAudioStream() {
     audio_stream_ = CreateStream(DemuxerStream::AUDIO);
   }
@@ skipping 102 matching lines @@
   EXPECT_EQ(0, size.height());
 }
 
 TEST_F(PipelineImplTest, NeverInitializes) {
   // This test hangs during initialization by never calling
   // InitializationComplete().  StrictMock<> will ensure that the callback is
   // never executed.
   pipeline_->Start(mocks_->filter_collection(false,
                                              false,
                                              true,
-                                             PIPELINE_OK),
+                                             PIPELINE_OK).Pass(),
                    "",
                    base::Bind(&CallbackHelper::OnStart,
                               base::Unretained(&callbacks_)));
   message_loop_.RunAllPending();
 
   EXPECT_FALSE(pipeline_->IsInitialized());
 
   // Because our callback will get executed when the test tears down, we'll
   // verify that nothing has been called, then set our expectation for the call
   // made during tear down.
   Mock::VerifyAndClear(&callbacks_);
   EXPECT_CALL(callbacks_, OnStart(PIPELINE_OK));
 }
 
 TEST_F(PipelineImplTest, RequiredFilterMissing) {
   EXPECT_CALL(callbacks_, OnError(PIPELINE_ERROR_REQUIRED_FILTER_MISSING));
 
   // Sets up expectations on the callback and initializes the pipeline.  Called
   // after tests have set expectations any filters they wish to use.
   // Expect an initialization callback.
   EXPECT_CALL(callbacks_, OnStart(PIPELINE_ERROR_REQUIRED_FILTER_MISSING));
 
   // Create a filter collection with missing filter.
-  FilterCollection* collection =
-      mocks_->filter_collection(false,
-                                true,
-                                true,
-                                PIPELINE_ERROR_REQUIRED_FILTER_MISSING);
-  pipeline_->Start(collection, "",
+  scoped_ptr<FilterCollection> collection(mocks_->filter_collection(
+      false, true, true, PIPELINE_ERROR_REQUIRED_FILTER_MISSING));
+  pipeline_->Start(collection.Pass(), "",
                    base::Bind(&CallbackHelper::OnStart,
                               base::Unretained(&callbacks_)));
   message_loop_.RunAllPending();
 
   EXPECT_FALSE(pipeline_->IsInitialized());
 }
 
 TEST_F(PipelineImplTest, URLNotFound) {
   // TODO(acolwell,fischman): Since OnStart() is getting called with an error
   // code already, OnError() doesn't also need to get called.  Fix the pipeline
@@ skipping 548 matching lines @@
   TestPipelineStatusNotification(0);
 }
 
 // Test that different-thread, some-delay callback (the expected common case)
 // works correctly.
 TEST(PipelineStatusNotificationTest, DelayedCallback) {
   TestPipelineStatusNotification(20);
 }
 
 }  // namespace media