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

Unified Diff: media/cast/video_receiver/video_receiver_unittest.cc

Issue 126843003: Revert of Cast:Adding cast_transport_config and cleaning up (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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/cast/video_receiver/video_receiver.cc ('k') | media/cast/video_sender/codecs/vp8/vp8_encoder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/video_receiver/video_receiver_unittest.cc
diff --git a/media/cast/video_receiver/video_receiver_unittest.cc b/media/cast/video_receiver/video_receiver_unittest.cc
index e3823711a55c428886001a2a448a7e65c16d12c0..e13f0f59dceeff8b2c3f0975da5b49bd0d8f0381 100644
--- a/media/cast/video_receiver/video_receiver_unittest.cc
+++ b/media/cast/video_receiver/video_receiver_unittest.cc
@@ -35,10 +35,10 @@
++num_called_;
}
- void FrameToDecode(scoped_ptr<transport::EncodedVideoFrame> video_frame,
+ void FrameToDecode(scoped_ptr<EncodedVideoFrame> video_frame,
const base::TimeTicks& render_time) {
EXPECT_TRUE(video_frame->key_frame);
- EXPECT_EQ(transport::kVp8, video_frame->codec);
+ EXPECT_EQ(kVp8, video_frame->codec);
++num_called_;
}
@@ -69,12 +69,12 @@
protected:
VideoReceiverTest() {
// Configure to use vp8 software implementation.
- config_.codec = transport::kVp8;
+ config_.codec = kVp8;
config_.use_external_decoder = false;
task_runner_ = new test::FakeTaskRunner(&testing_clock_);
cast_environment_ = new CastEnvironment(&testing_clock_, task_runner_,
task_runner_, task_runner_, task_runner_, task_runner_,
- task_runner_, GetDefaultCastLoggingConfig());
+ GetDefaultCastLoggingConfig());
receiver_.reset(new
PeerVideoReceiver(cast_environment_, config_, &mock_transport_));
testing_clock_.Advance(
« no previous file with comments | « media/cast/video_receiver/video_receiver.cc ('k') | media/cast/video_sender/codecs/vp8/vp8_encoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698