Merge 21464 - Merged PipelineInternal into PipelineImpl, eliminating a ton of...

media/base/pipeline_impl_unittest.cc

Index: media/base/pipeline_impl_unittest.cc
===================================================================
--- media/base/pipeline_impl_unittest.cc	(revision 21734)
+++ media/base/pipeline_impl_unittest.cc	(working copy)
@@ -153,9 +153,6 @@
 
   // StrictMock<> will ensure these never get called, and valgrind/purify will
   // make sure the callbacks are instantly deleted.
-  pipeline_->Start(NULL, "",
-                   NewCallback(reinterpret_cast<CallbackHelper*>(&callbacks_),
-                               &CallbackHelper::OnStart));
   pipeline_->Stop(NewCallback(reinterpret_cast<CallbackHelper*>(&callbacks_),
                               &CallbackHelper::OnStop));
   pipeline_->Seek(kZero,
@@ -244,7 +241,7 @@
 }
 
 TEST_F(PipelineImplTest, NoStreams) {
-  // Manually set these expecations because SetPlaybackRate() is not called if
+  // Manually set these expectations because SetPlaybackRate() is not called if
   // we cannot fully initialize the pipeline.
   EXPECT_CALL(*mocks_->data_source(), Initialize("", NotNull()))
       .WillOnce(Invoke(&RunFilterCallback));
Property changes on: media\base\pipeline_impl_unittest.cc
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/media/base/pipeline_impl_unittest.cc:r69-2775
   Merged /trunk/src/media/base/pipeline_impl_unittest.cc:r21464