From fa8ae9a5356de3cb4fd820cc97d251c9a2ce000a Mon Sep 17 00:00:00 2001 From: "kjellander@webrtc.org" Date: Mon, 23 Nov 2015 12:44:01 +0100 Subject: [PATCH] Remove include from file_audio_device.cc Including this header in production code introduces static initializers, which is disallowed in Chromium. BUG=chromium:559766 TESTED=git cl try -c --bot=android_compile_rel --bot=linux_compile_rel --bot=win_compile_rel --bot=mac_compile_rel --bot=ios_rel --bot=linux_gn_rel --bot=win_x64_gn_rel --bot=mac_x64_gn_rel --bot=android_gn_rel -m tryserver.webrtc R=henrika@webrtc.org Review URL: https://codereview.webrtc.org/1468923002 . Cr-Commit-Position: refs/heads/master@{#10746} --- .../audio_device/dummy/file_audio_device.cc | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/webrtc/modules/audio_device/dummy/file_audio_device.cc b/webrtc/modules/audio_device/dummy/file_audio_device.cc index 9c7bf069d8..eb3d042ad7 100644 --- a/webrtc/modules/audio_device/dummy/file_audio_device.cc +++ b/webrtc/modules/audio_device/dummy/file_audio_device.cc @@ -7,21 +7,20 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include #include "webrtc/modules/audio_device/dummy/file_audio_device.h" #include "webrtc/system_wrappers/include/sleep.h" #include "webrtc/system_wrappers/include/thread_wrapper.h" namespace webrtc { -int kRecordingFixedSampleRate = 48000; -int kRecordingNumChannels = 2; -int kPlayoutFixedSampleRate = 48000; -int kPlayoutNumChannels = 2; -int kPlayoutBufferSize = kPlayoutFixedSampleRate / 100 - * kPlayoutNumChannels * 2; -int kRecordingBufferSize = kRecordingFixedSampleRate / 100 - * kRecordingNumChannels * 2; +const int kRecordingFixedSampleRate = 48000; +const int kRecordingNumChannels = 2; +const int kPlayoutFixedSampleRate = 48000; +const int kPlayoutNumChannels = 2; +const int kPlayoutBufferSize = kPlayoutFixedSampleRate / 100 + * kPlayoutNumChannels * 2; +const int kRecordingBufferSize = kRecordingFixedSampleRate / 100 + * kRecordingNumChannels * 2; FileAudioDevice::FileAudioDevice(const int32_t id, const char* inputFilename,