Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(747)

Unified Diff: media/base/pipeline_impl_unittest.cc

Issue 9015015: Take advantage of the new Pass() machinery on scoped_ptr{,_malloc}. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/pipeline_impl.cc ('k') | media/base/test_data_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/pipeline_impl_unittest.cc
diff --git a/media/base/pipeline_impl_unittest.cc b/media/base/pipeline_impl_unittest.cc
index e27bddafc84da056a5914531dbab0d99373af1e4..ee0a9f8353e9cecdb6813b2d1cd0b0f602781bab 100644
--- a/media/base/pipeline_impl_unittest.cc
+++ b/media/base/pipeline_impl_unittest.cc
@@ -205,7 +205,7 @@ class PipelineImplTest : public ::testing::Test {
pipeline_->Start(mocks_->filter_collection(true,
true,
true,
- build_status),
+ build_status).Pass(),
"",
base::Bind(&CallbackHelper::OnStart,
base::Unretained(&callbacks_)));
@@ -328,7 +328,7 @@ TEST_F(PipelineImplTest, NeverInitializes) {
pipeline_->Start(mocks_->filter_collection(false,
false,
true,
- PIPELINE_OK),
+ PIPELINE_OK).Pass(),
"",
base::Bind(&CallbackHelper::OnStart,
base::Unretained(&callbacks_)));
@@ -352,12 +352,9 @@ TEST_F(PipelineImplTest, RequiredFilterMissing) {
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();
« no previous file with comments | « media/base/pipeline_impl.cc ('k') | media/base/test_data_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698