diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-10-18 15:46:22 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-10-18 15:46:22 +0100 |
| commit | 4e180b6a0b4720a9b8e9e959a882386f690f08ff (patch) | |
| tree | 788435d09362885908ba5ba9ef868b852ca82c0b /media/cast/audio_sender/audio_encoder_unittest.cc | |
| parent | 1179b92b08db0c652a0cf003ab4d89b31ce3610f (diff) | |
| download | chromium_org-4e180b6a0b4720a9b8e9e959a882386f690f08ff.tar.gz | |
Merge from Chromium at DEPS revision 228962
This commit was generated by merge_to_master.py.
Change-Id: I23bd7d7766f213fd52f28ae5e1ecc6ae9df905ea
Diffstat (limited to 'media/cast/audio_sender/audio_encoder_unittest.cc')
| -rw-r--r-- | media/cast/audio_sender/audio_encoder_unittest.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/media/cast/audio_sender/audio_encoder_unittest.cc b/media/cast/audio_sender/audio_encoder_unittest.cc index 0b17f98056..b33424a606 100644 --- a/media/cast/audio_sender/audio_encoder_unittest.cc +++ b/media/cast/audio_sender/audio_encoder_unittest.cc @@ -6,14 +6,14 @@ #include "base/memory/scoped_ptr.h" #include "media/cast/audio_sender/audio_encoder.h" #include "media/cast/cast_config.h" -#include "media/cast/cast_thread.h" +#include "media/cast/cast_environment.h" #include "media/cast/test/fake_task_runner.h" #include "testing/gtest/include/gtest/gtest.h" namespace media { namespace cast { -static const int64 kStartMillisecond = 123456789; +static const int64 kStartMillisecond = GG_INT64_C(12345678900000); static void RelaseFrame(const PcmAudioFrame* frame) { delete frame; @@ -32,8 +32,8 @@ class AudioEncoderTest : public ::testing::Test { virtual void SetUp() { task_runner_ = new test::FakeTaskRunner(&testing_clock_); - cast_thread_ = new CastThread(task_runner_, task_runner_, task_runner_, - task_runner_, task_runner_); + cast_environment_ = new CastEnvironment(&testing_clock_, task_runner_, + task_runner_, task_runner_, task_runner_, task_runner_); AudioSenderConfig audio_config; audio_config.codec = kOpus; audio_config.use_external_encoder = false; @@ -42,15 +42,15 @@ class AudioEncoderTest : public ::testing::Test { audio_config.bitrate = 64000; audio_config.rtp_payload_type = 127; - audio_encoder_ = new AudioEncoder(cast_thread_, audio_config); + audio_encoder_ = new AudioEncoder(cast_environment_, audio_config); } - ~AudioEncoderTest() {} + virtual ~AudioEncoderTest() {} base::SimpleTestTickClock testing_clock_; scoped_refptr<test::FakeTaskRunner> task_runner_; scoped_refptr<AudioEncoder> audio_encoder_; - scoped_refptr<CastThread> cast_thread_; + scoped_refptr<CastEnvironment> cast_environment_; }; TEST_F(AudioEncoderTest, Encode20ms) { |