Commit 17f2e2b3 authored by Daniel Bratell's avatar Daniel Bratell Committed by Commit Bot

Renamed MockWebAudioDevice in webaudio unit tests

Both AudioContextTest and BaseAudioContextTest use a local test
class named MockWebAudioDevice. That is normally no big deal
but in jumbo builds they can be compiled in the same translation unit
and then the classes will collide. This patch gives the classes
unique prefixes so that no tests have to be excluded from jumbo.

Bug: 745732

Change-Id: Ie736a0541082c56af745d51061897a081d2d1da5
Reviewed-on: https://chromium-review.googlesource.com/575142
Commit-Queue: Daniel Bratell <bratell@opera.com>
Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487475}
parent e409c569
......@@ -16,11 +16,12 @@ namespace blink {
namespace {
class MockWebAudioDevice : public WebAudioDevice {
class MockWebAudioDeviceForAudioContext : public WebAudioDevice {
public:
explicit MockWebAudioDevice(double sample_rate, int frames_per_buffer)
explicit MockWebAudioDeviceForAudioContext(double sample_rate,
int frames_per_buffer)
: sample_rate_(sample_rate), frames_per_buffer_(frames_per_buffer) {}
~MockWebAudioDevice() override = default;
~MockWebAudioDeviceForAudioContext() override = default;
void Start() override {}
void Stop() override {}
......@@ -66,8 +67,8 @@ class AudioContextTestPlatform : public TestingPlatformSupport {
break;
}
return WTF::MakeUnique<MockWebAudioDevice>(AudioHardwareSampleRate(),
buffer_size);
return WTF::MakeUnique<MockWebAudioDeviceForAudioContext>(
AudioHardwareSampleRate(), buffer_size);
}
double AudioHardwareSampleRate() override { return 44100; }
......
......@@ -50,11 +50,12 @@ class MockCrossOriginLocalFrameClient final : public EmptyLocalFrameClient {
Member<Frame> parent_;
};
class MockWebAudioDevice : public WebAudioDevice {
class MockWebAudioDeviceForBaseAudioContext : public WebAudioDevice {
public:
explicit MockWebAudioDevice(double sample_rate, int frames_per_buffer)
explicit MockWebAudioDeviceForBaseAudioContext(double sample_rate,
int frames_per_buffer)
: sample_rate_(sample_rate), frames_per_buffer_(frames_per_buffer) {}
~MockWebAudioDevice() override = default;
~MockWebAudioDeviceForBaseAudioContext() override = default;
void Start() override {}
void Stop() override {}
......@@ -75,8 +76,8 @@ class BaseAudioContextTestPlatform : public TestingPlatformSupport {
WebAudioDevice::RenderCallback*,
const WebString& device_id,
const WebSecurityOrigin&) override {
return WTF::MakeUnique<MockWebAudioDevice>(AudioHardwareSampleRate(),
AudioHardwareBufferSize());
return WTF::MakeUnique<MockWebAudioDeviceForBaseAudioContext>(
AudioHardwareSampleRate(), AudioHardwareBufferSize());
}
double AudioHardwareSampleRate() override { return 44100; }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment