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

Side by Side Diff: media/base/pipeline_impl_unittest.cc

Issue 8678004: Revert 111320 - Disable PipelineImplTest.AudioStream on OS X (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Deleted: svn:mergeinfo
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <string> 5 #include <string>
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/stl_util.h" 9 #include "base/stl_util.h"
10 #include "base/threading/simple_thread.h" 10 #include "base/threading/simple_thread.h"
(...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after
374 // we cannot fully initialize the pipeline. 374 // we cannot fully initialize the pipeline.
375 EXPECT_CALL(*mocks_->demuxer(), Stop(_)) 375 EXPECT_CALL(*mocks_->demuxer(), Stop(_))
376 .WillOnce(Invoke(&RunStopFilterCallback)); 376 .WillOnce(Invoke(&RunStopFilterCallback));
377 // TODO(acolwell,fischman): see TODO in URLNotFound above. 377 // TODO(acolwell,fischman): see TODO in URLNotFound above.
378 EXPECT_CALL(callbacks_, OnError(PIPELINE_ERROR_COULD_NOT_RENDER)); 378 EXPECT_CALL(callbacks_, OnError(PIPELINE_ERROR_COULD_NOT_RENDER));
379 379
380 InitializePipeline(PIPELINE_OK, PIPELINE_ERROR_COULD_NOT_RENDER); 380 InitializePipeline(PIPELINE_OK, PIPELINE_ERROR_COULD_NOT_RENDER);
381 EXPECT_FALSE(pipeline_->IsInitialized()); 381 EXPECT_FALSE(pipeline_->IsInitialized());
382 } 382 }
383 383
384 #if defined(OS_MACOSX) 384 TEST_F(PipelineImplTest, AudioStream) {
385 // Crashes on OS X - http://crbug.com/105234
386 #define MAYBE_AudioStream DISABLED_AudioStream
387 #else
388 #define MAYBE_AudioStream AudioStream
389 #endif
390 TEST_F(PipelineImplTest, MAYBE_AudioStream) {
391 CreateAudioStream(); 385 CreateAudioStream();
392 MockDemuxerStreamVector streams; 386 MockDemuxerStreamVector streams;
393 streams.push_back(audio_stream()); 387 streams.push_back(audio_stream());
394 388
395 InitializeDemuxer(&streams, base::TimeDelta()); 389 InitializeDemuxer(&streams, base::TimeDelta());
396 InitializeAudioDecoder(audio_stream()); 390 InitializeAudioDecoder(audio_stream());
397 InitializeAudioRenderer(); 391 InitializeAudioRenderer();
398 392
399 InitializePipeline(PIPELINE_OK); 393 InitializePipeline(PIPELINE_OK);
400 EXPECT_TRUE(pipeline_->IsInitialized()); 394 EXPECT_TRUE(pipeline_->IsInitialized());
(...skipping 522 matching lines...) Expand 10 before | Expand all | Expand 10 after
923 TestPipelineStatusNotification(0); 917 TestPipelineStatusNotification(0);
924 } 918 }
925 919
926 // Test that different-thread, some-delay callback (the expected common case) 920 // Test that different-thread, some-delay callback (the expected common case)
927 // works correctly. 921 // works correctly.
928 TEST(PipelineStatusNotificationTest, DelayedCallback) { 922 TEST(PipelineStatusNotificationTest, DelayedCallback) {
929 TestPipelineStatusNotification(20); 923 TestPipelineStatusNotification(20);
930 } 924 }
931 925
932 } // namespace media 926 } // namespace media
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698