diff options
Diffstat (limited to 'chromium/media/base/fake_audio_worker_unittest.cc')
-rw-r--r-- | chromium/media/base/fake_audio_worker_unittest.cc | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/chromium/media/base/fake_audio_worker_unittest.cc b/chromium/media/base/fake_audio_worker_unittest.cc index e9977e58334..e2e6e2d90dd 100644 --- a/chromium/media/base/fake_audio_worker_unittest.cc +++ b/chromium/media/base/fake_audio_worker_unittest.cc @@ -35,11 +35,14 @@ class FakeAudioWorkerTest : public testing::Test { FakeAudioWorkerTest() : params_(AudioParameters::AUDIO_FAKE, CHANNEL_LAYOUT_STEREO, 44100, 128), fake_worker_(task_environment_.GetMainThreadTaskRunner(), params_) { - time_between_callbacks_ = base::TimeDelta::FromMicroseconds( + time_between_callbacks_ = base::Microseconds( params_.frames_per_buffer() * base::Time::kMicrosecondsPerSecond / static_cast<float>(params_.sample_rate())); } + FakeAudioWorkerTest(const FakeAudioWorkerTest&) = delete; + FakeAudioWorkerTest& operator=(const FakeAudioWorkerTest&) = delete; + ~FakeAudioWorkerTest() override = default; void CalledByFakeWorker(base::TimeTicks ideal_time, base::TimeTicks now) { @@ -93,9 +96,6 @@ class FakeAudioWorkerTest : public testing::Test { FakeAudioWorker fake_worker_; base::TimeDelta time_between_callbacks_; std::vector<base::TimeTicks> callbacks_; - - private: - DISALLOW_COPY_AND_ASSIGN(FakeAudioWorkerTest); }; TEST_F(FakeAudioWorkerTest, FakeBasicCallback) { @@ -181,13 +181,17 @@ class FakeAudioWorkerMockTaskTest : public testing::Test { fake_worker_(task_runner_, params_) { DCHECK(!global_clock_); global_clock_ = task_runner_->GetMockTickClock(); - time_between_callbacks_ = base::TimeDelta::FromMicroseconds( + time_between_callbacks_ = base::Microseconds( params_.frames_per_buffer() * base::Time::kMicrosecondsPerSecond / static_cast<float>(params_.sample_rate())); clock_overrides_ = std::make_unique<base::subtle::ScopedTimeClockOverrides>( nullptr, TimeTicksOverride, nullptr); } + FakeAudioWorkerMockTaskTest(const FakeAudioWorkerMockTaskTest&) = delete; + FakeAudioWorkerMockTaskTest& operator=(const FakeAudioWorkerMockTaskTest&) = + delete; + ~FakeAudioWorkerMockTaskTest() override { global_clock_ = nullptr; } void CalledByFakeWorker(base::TimeTicks ideal_time, base::TimeTicks now) { @@ -225,9 +229,6 @@ class FakeAudioWorkerMockTaskTest : public testing::Test { DCHECK(global_clock_); return global_clock_->NowTicks(); } - - private: - DISALLOW_COPY_AND_ASSIGN(FakeAudioWorkerMockTaskTest); }; const base::TickClock* FakeAudioWorkerMockTaskTest::global_clock_ = nullptr; |