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

Unified Diff: media/base/pipeline_impl_unittest.cc

Issue 7193001: Move rtc_video_decoder* from media/filter/ to content/renderer/media/. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 9 years, 5 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/filters/rtc_video_decoder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/pipeline_impl_unittest.cc
===================================================================
--- media/base/pipeline_impl_unittest.cc (revision 91577)
+++ 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";
// Used for setting expectations on pipeline callbacks. Using a StrictMock
// also lets us test for missing callbacks.
@@ -206,8 +206,8 @@
EXPECT_CALL(callbacks_, OnStart(start_status));
bool run_build = true;
- if (url.compare(kUrlMedia) == 0)
- run_build = false;
+ if (url.find(kRawMediaScheme) == 0)
+ run_build = false;
pipeline_->Start(mocks_->filter_collection(true,
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());
« no previous file with comments | « media/base/pipeline_impl.cc ('k') | media/filters/rtc_video_decoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698