Index: media/base/pipeline_impl_unittest.cc |
=================================================================== |
--- media/base/pipeline_impl_unittest.cc (revision 90607) |
+++ media/base/pipeline_impl_unittest.cc (working copy) |
@@ -34,7 +34,7 @@ |
static const int kBufferedBytes = 1024; |
// Test url for raw video pipeline. |
-static const std::string kUrlMedia = "media://raw_video_stream"; |
+static const char kUrlRawVideo[] = "://raw_video_stream"; |
scherkus (not reviewing)
2011/06/29 00:39:28
why not just append the x-raw-video: scheme here a
Ronghua
2011/06/29 20:36:39
I don't want to hard code the "x-raw-media" here,
|
// Used for setting expectations on pipeline callbacks. Using a StrictMock |
// also lets us test for missing callbacks. |
@@ -206,7 +206,7 @@ |
EXPECT_CALL(callbacks_, OnStart(start_status)); |
bool run_build = true; |
- if (url.compare(kUrlMedia) == 0) |
+ if (url.find(kRawMediaScheme) == 0) |
run_build = false; |
scherkus (not reviewing)
2011/06/29 00:39:28
this is over-indented -- can you fix?
Ronghua
2011/06/29 20:36:39
Done.
|
pipeline_->Start(mocks_->filter_collection(true, |
@@ -430,7 +430,8 @@ |
InitializeVideoDecoder(NULL); |
InitializeVideoRenderer(); |
- InitializePipeline(PIPELINE_OK, PIPELINE_OK, kUrlMedia); |
+ InitializePipeline(PIPELINE_OK, PIPELINE_OK, |
+ std::string(kRawMediaScheme).append(kUrlRawVideo)); |
EXPECT_TRUE(pipeline_->IsInitialized()); |
EXPECT_FALSE(pipeline_->HasAudio()); |
EXPECT_TRUE(pipeline_->HasVideo()); |