Remove the WEB_AUDIO compile time flag

Web audio already has a runtime feature flag, so the WEB_AUDIO compile-time flag wouldn't be needed. Per the comment in https://codereview.chromium.org/604753003/#msg8, it looks safe to remove the compile-time flag. Web audio is the last feature that uses a compile-time flag. Once we remove WEB_AUDIO, we can remove a lot of code to support compile-time features from the IDL comipler. BUG=417628 TBR=jochen@chromium.org Review URL: https://codereview.chromium.org/1557363002 Cr-Commit-Position: refs/heads/master@{#368554}
author: haraken <haraken@chromium.org> 2016-01-11 02:19:16 -0800
committer: Commit bot <commit-bot@chromium.org> 2016-01-11 10:21:33 +0000
commit: e7fc592f19c6ffde1296ff01482013a0dd68a977 (patch)
tree: 28e287dec98b03930acd720c728c11ac4cd47581
parent: 7fdccee949335fe31c65e24e47c4bd6da69b99d2 (diff)
download: chromium_src-e7fc592f19c6ffde1296ff01482013a0dd68a977.zip
chromium_src-e7fc592f19c6ffde1296ff01482013a0dd68a977.tar.gz
chromium_src-e7fc592f19c6ffde1296ff01482013a0dd68a977.tar.bz2
228 files changed, 48 insertions, 840 deletions
diff --git a/third_party/WebKit/Source/bindings/scripts/code_generator_v8.py b/third_party/WebKit/Source/bindings/scripts/code_generator_v8.py
index a08c3ac..07f7233 100644
--- a/third_party/WebKit/Source/bindings/scripts/code_generator_v8.py
+++ b/third_party/WebKit/Source/bindings/scripts/code_generator_v8.py
@@ -83,12 +83,22 @@ from v8_utilities import capitalize, cpp_name, conditional_string, v8_class_name
 from utilities import KNOWN_COMPONENTS, idl_filename_to_component, is_valid_component_dependency, is_testing_target
 
 
+def normalize_and_sort_includes(include_paths):
+    normalized_include_paths = []
+    for include_path in include_paths:
+        match = re.search(r'/gen/blink/(.*)$', posixpath.abspath(include_path))
+        if match:
+            include_path = match.group(1)
+        normalized_include_paths.append(include_path)
+    return sorted(normalized_include_paths)
+
+
 def render_template(include_paths, header_template, cpp_template,
                     template_context, component=None):
     template_context['code_generator'] = module_pyname
 
     # Add includes for any dependencies
-    template_context['header_includes'] = sorted(
+    template_context['header_includes'] = normalize_and_sort_includes(
         template_context['header_includes'])
 
     for include_path in include_paths:
@@ -97,7 +107,7 @@ def render_template(include_paths, header_template, cpp_template,
             assert is_valid_component_dependency(component, dependency)
         includes.add(include_path)
 
-    template_context['cpp_includes'] = sorted(includes)
+    template_context['cpp_includes'] = normalize_and_sort_includes(includes)
 
     header_text = header_template.render(template_context)
     cpp_text = cpp_template.render(template_context)
@@ -372,7 +382,7 @@ class CodeGeneratorUnionType(object):
             additional_header_includes.append(
                 'bindings/core/v8/UnionTypesCore.h')
 
-        template_context['header_includes'] = sorted(
+        template_context['header_includes'] = normalize_and_sort_includes(
             template_context['header_includes'] + additional_header_includes)
 
         header_text = header_template.render(template_context)
diff --git a/third_party/WebKit/Source/build/features.gypi b/third_party/WebKit/Source/build/features.gypi
index 6f42735..cc7026a 100644
--- a/third_party/WebKit/Source/build/features.gypi
+++ b/third_party/WebKit/Source/build/features.gypi
@@ -67,7 +67,6 @@
       }, { # OS!=android
         'feature_defines': [
           'ENABLE_INPUT_MULTIPLE_FIELDS_UI=1',
-          'ENABLE_WEB_AUDIO=1',
           'WTF_USE_ICCJPEG=1',
           'WTF_USE_QCMSLIB=1'
         ],
@@ -86,9 +85,6 @@
       ['OS=="android" and use_openmax_dl_fft!=0', {
         'feature_defines': [
           'WTF_USE_WEBAUDIO_OPENMAX_DL_FFT=1',
-          # Enabling the FFT is enough to enable WebAudio support to
-          # allow most WebAudio features to work on Android.
-          'ENABLE_WEB_AUDIO=1',
         ],
       }],
       ['use_default_render_theme==1', {
diff --git a/third_party/WebKit/Source/config.gni b/third_party/WebKit/Source/config.gni
index 45d5c83..6d584ff 100644
--- a/third_party/WebKit/Source/config.gni
+++ b/third_party/WebKit/Source/config.gni
@@ -64,7 +64,6 @@ if (is_android) {
   feature_defines_list += [ "WTF_USE_LOW_QUALITY_IMAGE_INTERPOLATION=1" ]
 } else {
   feature_defines_list += [
-    "ENABLE_WEB_AUDIO=1",
     "WTF_USE_ICCJPEG=1",
     "WTF_USE_QCMSLIB=1",
   ]
@@ -79,13 +78,7 @@ if (use_webaudio_ffmpeg) {
 }
 
 if (use_openmax_dl_fft) {
-  feature_defines_list += [
-    "WTF_USE_WEBAUDIO_OPENMAX_DL_FFT=1",
-
-    # Enabling the FFT is enough to enable WebAudio support to
-    # allow most WebAudio features to work on Android.
-    "ENABLE_WEB_AUDIO=1",
-  ]
+  feature_defines_list += [ "WTF_USE_WEBAUDIO_OPENMAX_DL_FFT=1" ]
 }
 
 if (use_default_render_theme) {
diff --git a/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp b/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp
index ecd1e12..106aa79 100644
--- a/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp
@@ -71,9 +71,12 @@
 #include "platform/MIMETypeRegistry.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/UserGestureIndicator.h"
+#include "platform/audio/AudioBus.h"
+#include "platform/audio/AudioSourceProviderClient.h"
 #include "platform/graphics/GraphicsLayer.h"
 #include "platform/weborigin/SecurityOrigin.h"
 #include "public/platform/Platform.h"
+#include "public/platform/WebAudioSourceProvider.h"
 #include "public/platform/WebContentDecryptionModule.h"
 #include "public/platform/WebInbandTextTrack.h"
 #include "wtf/CurrentTime.h"
@@ -82,11 +85,6 @@
 #include "wtf/text/CString.h"
 #include <limits>
 
-#if ENABLE(WEB_AUDIO)
-#include "platform/audio/AudioBus.h"
-#include "platform/audio/AudioSourceProviderClient.h"
-#include "public/platform/WebAudioSourceProvider.h"
-#endif
 
 namespace blink {
 
@@ -151,7 +149,6 @@ static void removeElementFromDocumentMap(HTMLMediaElement* element, Document* do
 class AudioSourceProviderClientLockScope {
     STACK_ALLOCATED();
 public:
-#if ENABLE(WEB_AUDIO)
     AudioSourceProviderClientLockScope(HTMLMediaElement& element)
         : m_client(element.audioSourceNode())
     {
@@ -166,10 +163,6 @@ public:
 
 private:
     Member<AudioSourceProviderClient> m_client;
-#else
-    explicit AudioSourceProviderClientLockScope(HTMLMediaElement&) { }
-    ~AudioSourceProviderClientLockScope() { }
-#endif
 };
 
 static const AtomicString& AudioKindToString(WebMediaPlayerClient::AudioTrackKind kind)
@@ -342,9 +335,7 @@ HTMLMediaElement::HTMLMediaElement(const QualifiedName& tagName, Document& docum
     , m_audioTracks(AudioTrackList::create(*this))
     , m_videoTracks(VideoTrackList::create(*this))
     , m_textTracks(nullptr)
-#if ENABLE(WEB_AUDIO)
     , m_audioSourceNode(nullptr)
-#endif
     , m_autoplayHelper(*this)
 {
 #if ENABLE(OILPAN)
@@ -395,13 +386,11 @@ HTMLMediaElement::~HTMLMediaElement()
     document().decrementLoadEventDelayCount();
 #endif
 
-#if ENABLE(WEB_AUDIO)
     // m_audioSourceNode is explicitly cleared by AudioNode::dispose().
     // Since AudioNode::dispose() is guaranteed to be always called before
     // the AudioNode is destructed, m_audioSourceNode is explicitly cleared
     // even if the AudioNode and the HTMLMediaElement die together.
     ASSERT(!m_audioSourceNode);
-#endif
 }
 
 #if ENABLE(OILPAN)
@@ -933,10 +922,8 @@ void HTMLMediaElement::loadResource(const KURL& url, ContentType& contentType, c
     // cache is an internal detail not exposed through the media element API.
     m_currentSrc = url;
 
-#if ENABLE(WEB_AUDIO)
     if (m_audioSourceNode)
         m_audioSourceNode->onCurrentSrcChanged(m_currentSrc);
-#endif
 
     WTF_LOG(Media, "HTMLMediaElement::loadResource(%p) - m_currentSrc -> %s", this, urlForLoggingMedia(m_currentSrc).utf8().data());
 
@@ -1032,10 +1019,8 @@ void HTMLMediaElement::startPlayerLoad()
 
     if (layoutObject())
         layoutObject()->setShouldDoFullPaintInvalidation();
-#if ENABLE(WEB_AUDIO)
     // Make sure if we create/re-create the WebMediaPlayer that we update our wrapper.
     m_audioSourceProvider.wrap(m_webMediaPlayer->audioSourceProvider());
-#endif
     m_webMediaPlayer->setVolume(effectiveMediaVolume());
 
     m_webMediaPlayer->setPoster(posterImageURL());
@@ -2994,13 +2979,9 @@ void HTMLMediaElement::stopPeriodicTimers()
 
 void HTMLMediaElement::clearMediaPlayerAndAudioSourceProviderClientWithoutLocking()
 {
-#if ENABLE(WEB_AUDIO)
     audioSourceProvider().setClient(nullptr);
-#endif
     if (m_webMediaPlayer) {
-#if ENABLE(WEB_AUDIO)
         m_audioSourceProvider.wrap(nullptr);
-#endif
         m_webMediaPlayer.clear();
     }
 }
@@ -3424,13 +3405,10 @@ void HTMLMediaElement::resetMediaPlayerAndMediaSource()
     m_remoteRoutesAvailable = false;
     m_playingRemotely = false;
 
-#if ENABLE(WEB_AUDIO)
     if (m_audioSourceNode)
         audioSourceProvider().setClient(m_audioSourceNode);
-#endif
 }
 
-#if ENABLE(WEB_AUDIO)
 void HTMLMediaElement::setAudioSourceNode(AudioSourceProviderClient* sourceNode)
 {
     ASSERT(isMainThread());
@@ -3439,7 +3417,6 @@ void HTMLMediaElement::setAudioSourceNode(AudioSourceProviderClient* sourceNode)
     AudioSourceProviderClientLockScope scope(*this);
     audioSourceProvider().setClient(m_audioSourceNode);
 }
-#endif
 
 void HTMLMediaElement::setAllowHiddenVolumeControls(bool allow)
 {
@@ -3510,10 +3487,8 @@ DEFINE_TRACE(HTMLMediaElement)
     visitor->trace(m_cueTimeline);
     visitor->trace(m_textTracks);
     visitor->trace(m_textTracksWhenResourceSelectionBegan);
-#if ENABLE(WEB_AUDIO)
     visitor->trace(m_audioSourceProvider);
     visitor->template registerWeakMembers<HTMLMediaElement, &HTMLMediaElement::clearWeakMembers>(this);
-#endif
     visitor->trace(m_autoplayHelper);
     HeapSupplementable<HTMLMediaElement>::trace(visitor);
 #endif
@@ -3589,7 +3564,6 @@ void HTMLMediaElement::triggerAutoplayViewportCheckForTesting()
     m_autoplayHelper.triggerAutoplayViewportCheckForTesting();
 }
 
-#if ENABLE(WEB_AUDIO)
 void HTMLMediaElement::clearWeakMembers(Visitor* visitor)
 {
     if (!Heap::isHeapObjectAlive(m_audioSourceNode))
@@ -3655,6 +3629,5 @@ DEFINE_TRACE(HTMLMediaElement::AudioSourceProviderImpl)
 {
     visitor->trace(m_client);
 }
-#endif
 
 }
diff --git a/third_party/WebKit/Source/core/html/HTMLMediaElement.h b/third_party/WebKit/Source/core/html/HTMLMediaElement.h
index 4c7126a..ae50335 100644
--- a/third_party/WebKit/Source/core/html/HTMLMediaElement.h
+++ b/third_party/WebKit/Source/core/html/HTMLMediaElement.h
@@ -33,20 +33,14 @@
 #include "core/html/HTMLElement.h"
 #include "core/html/track/TextTrack.h"
 #include "platform/Supplementable.h"
-#include "public/platform/WebMediaPlayerClient.h"
-#include "public/platform/WebMimeRegistry.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "platform/audio/AudioSourceProvider.h"
 #include "public/platform/WebAudioSourceProviderClient.h"
-#endif
+#include "public/platform/WebMediaPlayerClient.h"
+#include "public/platform/WebMimeRegistry.h"
 
 namespace blink {
 
-#if ENABLE(WEB_AUDIO)
 class AudioSourceProviderClient;
-class WebAudioSourceProvider;
-#endif
 class AudioTrackList;
 class ContentType;
 class CueTimeline;
@@ -63,6 +57,7 @@ class TextTrackList;
 class TimeRanges;
 class URLRegistry;
 class VideoTrackList;
+class WebAudioSourceProvider;
 class WebInbandTextTrack;
 class WebLayer;
 
@@ -77,9 +72,7 @@ public:
     static bool isMediaStreamURL(const String& url);
 
     DECLARE_VIRTUAL_TRACE();
-#if ENABLE(WEB_AUDIO)
     void clearWeakMembers(Visitor*);
-#endif
     WebMediaPlayer* webMediaPlayer() const
     {
         return m_webMediaPlayer.get();
@@ -233,12 +226,10 @@ public:
     // ActiveDOMObject functions.
     bool hasPendingActivity() const final;
 
-#if ENABLE(WEB_AUDIO)
     AudioSourceProviderClient* audioSourceNode() { return m_audioSourceNode; }
     void setAudioSourceNode(AudioSourceProviderClient*);
 
     AudioSourceProvider& audioSourceProvider() { return m_audioSourceProvider; }
-#endif
 
     enum InvalidURLAction { DoNothing, Complain };
     bool isSafeToLoadURL(const KURL&, InvalidURLAction);
@@ -566,7 +557,6 @@ private:
 
     OwnPtrWillBeMember<CueTimeline> m_cueTimeline;
 
-#if ENABLE(WEB_AUDIO)
     // This is a weak reference, since m_audioSourceNode holds a reference to us.
     // FIXME: Oilpan: Consider making this a strongly traced pointer with oilpan where strong cycles are not a problem.
     GC_PLUGIN_IGNORE("http://crbug.com/404577")
@@ -620,7 +610,6 @@ private:
     };
 
     AudioSourceProviderImpl m_audioSourceProvider;
-#endif
 
     friend class Internals;
     friend class TrackDisplayUpdateScope;
diff --git a/third_party/WebKit/Source/modules/EventTargetModulesFactory.in b/third_party/WebKit/Source/modules/EventTargetModulesFactory.in
index 2ac1b50..d14f813 100644
--- a/third_party/WebKit/Source/modules/EventTargetModulesFactory.in
+++ b/third_party/WebKit/Source/modules/EventTargetModulesFactory.in
@@ -36,8 +36,8 @@ modules/serviceworkers/ServiceWorkerRegistration
 modules/speech/SpeechRecognition
 modules/speech/SpeechSynthesis
 modules/speech/SpeechSynthesisUtterance
-modules/webaudio/AudioContext Conditional=WEB_AUDIO
-modules/webaudio/AudioNode Conditional=WEB_AUDIO
+modules/webaudio/AudioContext
+modules/webaudio/AudioNode
 modules/webmidi/MIDIAccess
 modules/webmidi/MIDIInput
 modules/webmidi/MIDIPort
diff --git a/third_party/WebKit/Source/modules/webaudio/AbstractAudioContext.cpp b/third_party/WebKit/Source/modules/webaudio/AbstractAudioContext.cpp
index 2037fe5..dce992d 100644
--- a/third_party/WebKit/Source/modules/webaudio/AbstractAudioContext.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/AbstractAudioContext.cpp
@@ -23,8 +23,6 @@
  */
 
 #include "modules/webaudio/AbstractAudioContext.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "bindings/core/v8/Dictionary.h"
 #include "bindings/core/v8/ExceptionMessages.h"
 #include "bindings/core/v8/ExceptionState.h"
@@ -790,4 +788,3 @@ SecurityOrigin* AbstractAudioContext::securityOrigin() const
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/modules/webaudio/AbstractAudioContext.h b/third_party/WebKit/Source/modules/webaudio/AbstractAudioContext.h
index b96bce1..cb3abaf 100644
--- a/third_party/WebKit/Source/modules/webaudio/AbstractAudioContext.h
+++ b/third_party/WebKit/Source/modules/webaudio/AbstractAudioContext.h
@@ -44,8 +44,6 @@
 #include "wtf/Vector.h"
 #include "wtf/build_config.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class AnalyserNode;
@@ -325,6 +323,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // AbstractAudioContext_h
diff --git a/third_party/WebKit/Source/modules/webaudio/AnalyserNode.cpp b/third_party/WebKit/Source/modules/webaudio/AnalyserNode.cpp
index b7d10fa..c4127d7 100644
--- a/third_party/WebKit/Source/modules/webaudio/AnalyserNode.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/AnalyserNode.cpp
@@ -23,8 +23,6 @@
  */
 
 #include "modules/webaudio/AnalyserNode.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "bindings/core/v8/ExceptionMessages.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/dom/ExceptionCode.h"
@@ -198,4 +196,3 @@ void AnalyserNode::getByteTimeDomainData(DOMUint8Array* array)
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/modules/webaudio/AnalyserNode.h b/third_party/WebKit/Source/modules/webaudio/AnalyserNode.h
index 4fb18b3..f7cbea4 100644
--- a/third_party/WebKit/Source/modules/webaudio/AnalyserNode.h
+++ b/third_party/WebKit/Source/modules/webaudio/AnalyserNode.h
@@ -29,8 +29,6 @@
 #include "modules/webaudio/AudioBasicInspectorNode.h"
 #include "modules/webaudio/RealtimeAnalyser.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class AbstractAudioContext;
@@ -95,6 +93,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // AnalyserNode_h
diff --git a/third_party/WebKit/Source/modules/webaudio/AnalyserNode.idl b/third_party/WebKit/Source/modules/webaudio/AnalyserNode.idl
index f066b8c..854920e 100644
--- a/third_party/WebKit/Source/modules/webaudio/AnalyserNode.idl
+++ b/third_party/WebKit/Source/modules/webaudio/AnalyserNode.idl
@@ -22,9 +22,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-[
-    Conditional=WEB_AUDIO,
-] interface AnalyserNode : AudioNode {
+interface AnalyserNode : AudioNode {
     [RaisesException=Setter] attribute unsigned long fftSize;
     readonly attribute unsigned long frequencyBinCount;
 
diff --git a/third_party/WebKit/Source/modules/webaudio/AsyncAudioDecoder.cpp b/third_party/WebKit/Source/modules/webaudio/AsyncAudioDecoder.cpp
index 05264c2..1a2764a 100644
--- a/third_party/WebKit/Source/modules/webaudio/AsyncAudioDecoder.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/AsyncAudioDecoder.cpp
@@ -23,8 +23,6 @@
  */
 
 #include "modules/webaudio/AsyncAudioDecoder.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "core/dom/DOMArrayBuffer.h"
 #include "modules/webaudio/AudioBuffer.h"
 #include "modules/webaudio/AudioBufferCallback.h"
@@ -86,4 +84,3 @@ void AsyncAudioDecoder::notifyComplete(DOMArrayBuffer* audioData, AudioBufferCal
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/modules/webaudio/AsyncAudioDecoder.h b/third_party/WebKit/Source/modules/webaudio/AsyncAudioDecoder.h
index 0719de0..756833a 100644
--- a/third_party/WebKit/Source/modules/webaudio/AsyncAudioDecoder.h
+++ b/third_party/WebKit/Source/modules/webaudio/AsyncAudioDecoder.h
@@ -30,8 +30,6 @@
 #include "wtf/OwnPtr.h"
 #include "wtf/build_config.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class AudioBuffer;
@@ -62,6 +60,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // AsyncAudioDecoder_h
diff --git a/third_party/WebKit/Source/modules/webaudio/AudioBasicInspectorNode.cpp b/third_party/WebKit/Source/modules/webaudio/AudioBasicInspectorNode.cpp
index 802e354..c71427c 100644
--- a/third_party/WebKit/Source/modules/webaudio/AudioBasicInspectorNode.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/AudioBasicInspectorNode.cpp
@@ -23,8 +23,6 @@
  */
 
 #include "modules/webaudio/AudioBasicInspectorNode.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "modules/webaudio/AbstractAudioContext.h"
 #include "modules/webaudio/AudioNodeInput.h"
 #include "modules/webaudio/AudioNodeOutput.h"
@@ -119,4 +117,3 @@ void AudioBasicInspectorHandler::updatePullStatus()
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/modules/webaudio/AudioBasicInspectorNode.h b/third_party/WebKit/Source/modules/webaudio/AudioBasicInspectorNode.h
index 1de9701..4a27e79 100644
--- a/third_party/WebKit/Source/modules/webaudio/AudioBasicInspectorNode.h
+++ b/third_party/WebKit/Source/modules/webaudio/AudioBasicInspectorNode.h
@@ -27,8 +27,6 @@
 
 #include "modules/webaudio/AudioNode.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class AbstractAudioContext;
@@ -64,6 +62,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // AudioBasicInspectorNode_h
diff --git a/third_party/WebKit/Source/modules/webaudio/AudioBasicProcessorHandler.cpp b/third_party/WebKit/Source/modules/webaudio/AudioBasicProcessorHandler.cpp
index 0b20db4..8d3970c 100644
--- a/third_party/WebKit/Source/modules/webaudio/AudioBasicProcessorHandler.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/AudioBasicProcessorHandler.cpp
@@ -23,8 +23,6 @@
  */
 
 #include "modules/webaudio/AudioBasicProcessorHandler.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "modules/webaudio/AudioNodeInput.h"
 #include "modules/webaudio/AudioNodeOutput.h"
 #include "platform/audio/AudioBus.h"
@@ -149,4 +147,3 @@ double AudioBasicProcessorHandler::latencyTime() const
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/modules/webaudio/AudioBasicProcessorHandler.h b/third_party/WebKit/Source/modules/webaudio/AudioBasicProcessorHandler.h
index 777ffc0..2b8ab3d 100644
--- a/third_party/WebKit/Source/modules/webaudio/AudioBasicProcessorHandler.h
+++ b/third_party/WebKit/Source/modules/webaudio/AudioBasicProcessorHandler.h
@@ -29,8 +29,6 @@
 #include "modules/webaudio/AudioNode.h"
 #include "wtf/Forward.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class AudioNodeInput;
@@ -66,6 +64,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // AudioBasicProcessorHandler_h
diff --git a/third_party/WebKit/Source/modules/webaudio/AudioBasicProcessorHandlerTest.cpp b/third_party/WebKit/Source/modules/webaudio/AudioBasicProcessorHandlerTest.cpp
index 0a5a176..612c176 100644
--- a/third_party/WebKit/Source/modules/webaudio/AudioBasicProcessorHandlerTest.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/AudioBasicProcessorHandlerTest.cpp
@@ -3,8 +3,6 @@
 // found in the LICENSE file.
 
 #include "modules/webaudio/AudioBasicProcessorHandler.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "core/testing/DummyPageHolder.h"
 #include "modules/webaudio/OfflineAudioContext.h"
 #include "platform/audio/AudioProcessor.h"
@@ -53,4 +51,3 @@ TEST(AudioBasicProcessorHandlerTest, ProcessorFinalization)
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/modules/webaudio/AudioBuffer.cpp b/third_party/WebKit/Source/modules/webaudio/AudioBuffer.cpp
index 935d6ce..be4f480 100644
--- a/third_party/WebKit/Source/modules/webaudio/AudioBuffer.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/AudioBuffer.cpp
@@ -27,8 +27,6 @@
  */
 
 #include "modules/webaudio/AudioBuffer.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "bindings/core/v8/ExceptionMessages.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/dom/ExceptionCode.h"
@@ -308,4 +306,3 @@ void AudioBuffer::zero()
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/modules/webaudio/AudioBuffer.h b/third_party/WebKit/Source/modules/webaudio/AudioBuffer.h
index 5d9cd93..9fd53c3 100644
--- a/third_party/WebKit/Source/modules/webaudio/AudioBuffer.h
+++ b/third_party/WebKit/Source/modules/webaudio/AudioBuffer.h
@@ -37,8 +37,6 @@
 #include "wtf/Vector.h"
 #include "wtf/build_config.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class AudioBus;
@@ -89,6 +87,4 @@ protected:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // AudioBuffer_h
diff --git a/third_party/WebKit/Source/modules/webaudio/AudioBuffer.idl b/third_party/WebKit/Source/modules/webaudio/AudioBuffer.idl
index 3999ff6..155a9c6 100644
--- a/third_party/WebKit/Source/modules/webaudio/AudioBuffer.idl
+++ b/third_party/WebKit/Source/modules/webaudio/AudioBuffer.idl
@@ -28,7 +28,6 @@
 
 [
     GarbageCollected,
-    Conditional=WEB_AUDIO
 ] interface AudioBuffer {
     readonly attribute long length; // in sample-frames
     readonly attribute double duration; // in seconds
diff --git a/third_party/WebKit/Source/modules/webaudio/AudioBufferCallback.h b/third_party/WebKit/Source/modules/webaudio/AudioBufferCallback.h
index 05cb6e7..a1fc346 100644
--- a/third_party/WebKit/Source/modules/webaudio/AudioBufferCallback.h
+++ b/third_party/WebKit/Source/modules/webaudio/AudioBufferCallback.h
@@ -28,8 +28,6 @@
 #include "platform/heap/Handle.h"
 #include "wtf/build_config.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class AudioBuffer;
@@ -43,6 +41,4 @@ public:
 
 } // namespace
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // AudioBufferCallback_h
diff --git a/third_party/WebKit/Source/modules/webaudio/AudioBufferCallback.idl b/third_party/WebKit/Source/modules/webaudio/AudioBufferCallback.idl
index aa1c383..00a0b7b 100644
--- a/third_party/WebKit/Source/modules/webaudio/AudioBufferCallback.idl
+++ b/third_party/WebKit/Source/modules/webaudio/AudioBufferCallback.idl
@@ -22,8 +22,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-[
-    Conditional=WEB_AUDIO
-] callback interface AudioBufferCallback {
+callback interface AudioBufferCallback {
     void handleEvent(AudioBuffer audioBuffer);
 };
diff --git a/third_party/WebKit/Source/modules/webaudio/AudioBufferSourceNode.cpp b/third_party/WebKit/Source/modules/webaudio/AudioBufferSourceNode.cpp
index f1ba8be..0dceaa9 100644
--- a/third_party/WebKit/Source/modules/webaudio/AudioBufferSourceNode.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/AudioBufferSourceNode.cpp
@@ -23,8 +23,6 @@
  */
 
 #include "modules/webaudio/AudioBufferSourceNode.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "bindings/core/v8/ExceptionMessages.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/dom/ExceptionCode.h"
@@ -713,4 +711,3 @@ void AudioBufferSourceNode::start(double when, double grainOffset, double grainD
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/modules/webaudio/AudioBufferSourceNode.h b/third_party/WebKit/Source/modules/webaudio/AudioBufferSourceNode.h
index 1bdfed9..d1c085e 100644
--- a/third_party/WebKit/Source/modules/webaudio/AudioBufferSourceNode.h
+++ b/third_party/WebKit/Source/modules/webaudio/AudioBufferSourceNode.h
@@ -35,8 +35,6 @@
 #include "wtf/RefPtr.h"
 #include "wtf/Threading.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class AbstractAudioContext;
@@ -191,6 +189,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // AudioBufferSourceNode_h
diff --git a/third_party/WebKit/Source/modules/webaudio/AudioBufferSourceNode.idl b/third_party/WebKit/Source/modules/webaudio/AudioBufferSourceNode.idl
index 1d3adaa..3daec8c 100644
--- a/third_party/WebKit/Source/modules/webaudio/AudioBufferSourceNode.idl
+++ b/third_party/WebKit/Source/modules/webaudio/AudioBufferSourceNode.idl
@@ -23,9 +23,7 @@
  */
 
 // A cached (non-streamed), memory-resident audio source
-[
-    Conditional=WEB_AUDIO,
-] interface AudioBufferSourceNode : AudioSourceNode {
+interface AudioBufferSourceNode : AudioSourceNode {
     [RaisesException=Setter] attribute AudioBuffer buffer;
 
     readonly attribute AudioParam playbackRate;
diff --git a/third_party/WebKit/Source/modules/webaudio/AudioContext.cpp b/third_party/WebKit/Source/modules/webaudio/AudioContext.cpp
index 1c98014..5ecab1c 100644
--- a/third_party/WebKit/Source/modules/webaudio/AudioContext.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/AudioContext.cpp
@@ -15,8 +15,6 @@
 #include <stdio.h>
 #endif
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 // Don't allow more than this number of simultaneous AudioContexts
@@ -197,4 +195,3 @@ void AudioContext::stopRendering()
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/modules/webaudio/AudioContext.h b/third_party/WebKit/Source/modules/webaudio/AudioContext.h
index 4e64fd2..bbe724b 100644
--- a/third_party/WebKit/Source/modules/webaudio/AudioContext.h
+++ b/third_party/WebKit/Source/modules/webaudio/AudioContext.h
@@ -10,8 +10,6 @@
 #include "modules/webaudio/AbstractAudioContext.h"
 #include "platform/heap/Handle.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class Document;
@@ -49,6 +47,4 @@ private:
 
 }
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // AudioContext_h
diff --git a/third_party/WebKit/Source/modules/webaudio/AudioContext.idl b/third_party/WebKit/Source/modules/webaudio/AudioContext.idl
index c995daa..e7f4e6d 100644
--- a/third_party/WebKit/Source/modules/webaudio/AudioContext.idl
+++ b/third_party/WebKit/Source/modules/webaudio/AudioContext.idl
@@ -32,7 +32,6 @@ enum AudioContextState {
 [
     GarbageCollected,
     ActiveDOMObject,
-    Conditional=WEB_AUDIO,
     Constructor,
     ConstructorCallWith=Document,
     ImplementedAs=AbstractAudioContext,
diff --git a/third_party/WebKit/Source/modules/webaudio/AudioDestinationNode.cpp b/third_party/WebKit/Source/modules/webaudio/AudioDestinationNode.cpp
index d60a91c..4d71214 100644
--- a/third_party/WebKit/Source/modules/webaudio/AudioDestinationNode.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/AudioDestinationNode.cpp
@@ -23,8 +23,6 @@
  */
 
 #include "modules/webaudio/AudioDestinationNode.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "modules/webaudio/AbstractAudioContext.h"
 #include "modules/webaudio/AudioNodeInput.h"
 #include "modules/webaudio/AudioNodeOutput.h"
@@ -113,4 +111,3 @@ unsigned long AudioDestinationNode::maxChannelCount() const
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/modules/webaudio/AudioDestinationNode.h b/third_party/WebKit/Source/modules/webaudio/AudioDestinationNode.h
index a81464f..a25e598 100644
--- a/third_party/WebKit/Source/modules/webaudio/AudioDestinationNode.h
+++ b/third_party/WebKit/Source/modules/webaudio/AudioDestinationNode.h
@@ -31,8 +31,6 @@
 #include "platform/audio/AudioIOCallback.h"
 #include "platform/audio/AudioSourceProvider.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class AudioBus;
@@ -106,6 +104,4 @@ protected:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // AudioDestinationNode_h
diff --git a/third_party/WebKit/Source/modules/webaudio/AudioDestinationNode.idl b/third_party/WebKit/Source/modules/webaudio/AudioDestinationNode.idl
index e85caef..f638bb2 100644
--- a/third_party/WebKit/Source/modules/webaudio/AudioDestinationNode.idl
+++ b/third_party/WebKit/Source/modules/webaudio/AudioDestinationNode.idl
@@ -22,8 +22,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-[
-    Conditional=WEB_AUDIO
-] interface AudioDestinationNode : AudioNode {
+interface AudioDestinationNode : AudioNode {
     readonly attribute unsigned long maxChannelCount;
 };
diff --git a/third_party/WebKit/Source/modules/webaudio/AudioListener.cpp b/third_party/WebKit/Source/modules/webaudio/AudioListener.cpp
index 64762e3..23509ee 100644
--- a/third_party/WebKit/Source/modules/webaudio/AudioListener.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/AudioListener.cpp
@@ -27,8 +27,6 @@
  */
 
 #include "modules/webaudio/AudioListener.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "modules/webaudio/PannerNode.h"
 #include "platform/audio/AudioBus.h"
 #include "platform/audio/HRTFDatabaseLoader.h"
@@ -158,4 +156,3 @@ void AudioListener::setSpeedOfSound(double speedOfSound)
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/modules/webaudio/AudioListener.h b/third_party/WebKit/Source/modules/webaudio/AudioListener.h
index 8c9c798..f85adfe 100644
--- a/third_party/WebKit/Source/modules/webaudio/AudioListener.h
+++ b/third_party/WebKit/Source/modules/webaudio/AudioListener.h
@@ -34,8 +34,6 @@
 #include "platform/heap/Handle.h"
 #include "wtf/Vector.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class HRTFDatabaseLoader;
@@ -119,6 +117,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // AudioListener_h
diff --git a/third_party/WebKit/Source/modules/webaudio/AudioListener.idl b/third_party/WebKit/Source/modules/webaudio/AudioListener.idl
index 4783450..843e290 100644
--- a/third_party/WebKit/Source/modules/webaudio/AudioListener.idl
+++ b/third_party/WebKit/Source/modules/webaudio/AudioListener.idl
@@ -28,7 +28,6 @@
 
 [
     GarbageCollected,
-    Conditional=WEB_AUDIO,
 ] interface AudioListener {
     [DeprecateAs=AudioListenerDopplerFactor] attribute float dopplerFactor;  // same as OpenAL (default 1.0)
     [DeprecateAs=AudioListenerSpeedOfSound] attribute float speedOfSound;   // in meters / second (default 343.3)
diff --git a/third_party/WebKit/Source/modules/webaudio/AudioNode.cpp b/third_party/WebKit/Source/modules/webaudio/AudioNode.cpp
index c4d916c..4b37227 100644
--- a/third_party/WebKit/Source/modules/webaudio/AudioNode.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/AudioNode.cpp
@@ -23,8 +23,6 @@
  */
 
 #include "modules/webaudio/AudioNode.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/inspector/InstanceCounters.h"
@@ -942,4 +940,3 @@ void AudioNode::didAddOutput(unsigned numberOfOutputs)
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/modules/webaudio/AudioNode.h b/third_party/WebKit/Source/modules/webaudio/AudioNode.h
index a243d8d..4f5456f 100644
--- a/third_party/WebKit/Source/modules/webaudio/AudioNode.h
+++ b/third_party/WebKit/Source/modules/webaudio/AudioNode.h
@@ -35,8 +35,6 @@
 #include "wtf/Vector.h"
 #include "wtf/build_config.h"
 
-#if ENABLE(WEB_AUDIO)
-
 #define DEBUG_AUDIONODE_REFERENCES 0
 
 namespace blink {
@@ -339,6 +337,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // AudioNode_h
diff --git a/third_party/WebKit/Source/modules/webaudio/AudioNode.idl b/third_party/WebKit/Source/modules/webaudio/AudioNode.idl
index 9f6ef3b..7dbb3a8 100644
--- a/third_party/WebKit/Source/modules/webaudio/AudioNode.idl
+++ b/third_party/WebKit/Source/modules/webaudio/AudioNode.idl
@@ -36,7 +36,6 @@ enum ChannelInterpretation {
 // http://webaudio.github.io/web-audio-api/#idl-def-AudioNode
 
 [
-    Conditional=WEB_AUDIO,
     GarbageCollected,
 ] interface AudioNode : EventTarget {
     [RaisesException, MeasureAs=AudioNodeConnectToAudioNode] AudioNode connect(AudioNode destination, optional unsigned long output = 0, optional unsigned long input = 0);
diff --git a/third_party/WebKit/Source/modules/webaudio/AudioNodeInput.cpp b/third_party/WebKit/Source/modules/webaudio/AudioNodeInput.cpp
index 260a34b..a6af8e3 100644
--- a/third_party/WebKit/Source/modules/webaudio/AudioNodeInput.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/AudioNodeInput.cpp
@@ -23,8 +23,6 @@
  */
 
 #include "modules/webaudio/AudioNodeInput.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "modules/webaudio/AudioNodeOutput.h"
 #include <algorithm>
 
@@ -222,4 +220,3 @@ AudioBus* AudioNodeInput::pull(AudioBus* inPlaceBus, size_t framesToProcess)
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/modules/webaudio/AudioNodeInput.h b/third_party/WebKit/Source/modules/webaudio/AudioNodeInput.h
index 9170f3d..c790d9a 100644
--- a/third_party/WebKit/Source/modules/webaudio/AudioNodeInput.h
+++ b/third_party/WebKit/Source/modules/webaudio/AudioNodeInput.h
@@ -31,8 +31,6 @@
 #include "wtf/Allocator.h"
 #include "wtf/HashSet.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class AudioNodeOutput;
@@ -106,6 +104,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // AudioNodeInput_h
diff --git a/third_party/WebKit/Source/modules/webaudio/AudioNodeOutput.cpp b/third_party/WebKit/Source/modules/webaudio/AudioNodeOutput.cpp
index e3646c0..1bc384d6 100644
--- a/third_party/WebKit/Source/modules/webaudio/AudioNodeOutput.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/AudioNodeOutput.cpp
@@ -23,8 +23,6 @@
  */
 
 #include "modules/webaudio/AudioNodeOutput.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "modules/webaudio/AbstractAudioContext.h"
 #include "modules/webaudio/AudioNodeInput.h"
 #include "wtf/Threading.h"
@@ -262,4 +260,3 @@ void AudioNodeOutput::enable()
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/modules/webaudio/AudioNodeOutput.h b/third_party/WebKit/Source/modules/webaudio/AudioNodeOutput.h
index a3ec3ca..ebddbff 100644
--- a/third_party/WebKit/Source/modules/webaudio/AudioNodeOutput.h
+++ b/third_party/WebKit/Source/modules/webaudio/AudioNodeOutput.h
@@ -31,8 +31,6 @@
 #include "wtf/HashSet.h"
 #include "wtf/RefPtr.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class AudioNodeInput;
@@ -167,6 +165,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // AudioNodeOutput_h
diff --git a/third_party/WebKit/Source/modules/webaudio/AudioParam.cpp b/third_party/WebKit/Source/modules/webaudio/AudioParam.cpp
index e83e3a2..3c31385 100644
--- a/third_party/WebKit/Source/modules/webaudio/AudioParam.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/AudioParam.cpp
@@ -24,8 +24,6 @@
  */
 
 #include "modules/webaudio/AudioParam.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "modules/webaudio/AudioNode.h"
 #include "modules/webaudio/AudioNodeOutput.h"
 #include "platform/FloatConversion.h"
@@ -269,4 +267,3 @@ AudioParam* AudioParam::cancelScheduledValues(double startTime, ExceptionState&
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/modules/webaudio/AudioParam.h b/third_party/WebKit/Source/modules/webaudio/AudioParam.h
index be9d655..61924e1 100644
--- a/third_party/WebKit/Source/modules/webaudio/AudioParam.h
+++ b/third_party/WebKit/Source/modules/webaudio/AudioParam.h
@@ -38,8 +38,6 @@
 #include "wtf/text/WTFString.h"
 #include <sys/types.h>
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class AudioNodeOutput;
@@ -160,6 +158,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // AudioParam_h
diff --git a/third_party/WebKit/Source/modules/webaudio/AudioParam.idl b/third_party/WebKit/Source/modules/webaudio/AudioParam.idl
index cc3746f..02501ec 100644
--- a/third_party/WebKit/Source/modules/webaudio/AudioParam.idl
+++ b/third_party/WebKit/Source/modules/webaudio/AudioParam.idl
@@ -28,7 +28,6 @@
 
 [
     GarbageCollected,
-    Conditional=WEB_AUDIO,
 ] interface AudioParam {
     attribute float value;
     readonly attribute float defaultValue;
diff --git a/third_party/WebKit/Source/modules/webaudio/AudioParamTimeline.cpp b/third_party/WebKit/Source/modules/webaudio/AudioParamTimeline.cpp
index 6e4b87e..2e5bbf4 100644
--- a/third_party/WebKit/Source/modules/webaudio/AudioParamTimeline.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/AudioParamTimeline.cpp
@@ -24,8 +24,6 @@
  */
 
 #include "modules/webaudio/AudioParamTimeline.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/dom/ExceptionCode.h"
 #include "platform/FloatConversion.h"
@@ -764,4 +762,3 @@ float AudioParamTimeline::valuesForFrameRangeImpl(
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/modules/webaudio/AudioParamTimeline.h b/third_party/WebKit/Source/modules/webaudio/AudioParamTimeline.h
index ce799b2..7e34619 100644
--- a/third_party/WebKit/Source/modules/webaudio/AudioParamTimeline.h
+++ b/third_party/WebKit/Source/modules/webaudio/AudioParamTimeline.h
@@ -35,8 +35,6 @@
 #include "wtf/Threading.h"
 #include "wtf/Vector.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class AudioParamTimeline {
@@ -126,6 +124,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // AudioParamTimeline_h
diff --git a/third_party/WebKit/Source/modules/webaudio/AudioProcessingEvent.cpp b/third_party/WebKit/Source/modules/webaudio/AudioProcessingEvent.cpp
index 01cac99..0d1c788 100644
--- a/third_party/WebKit/Source/modules/webaudio/AudioProcessingEvent.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/AudioProcessingEvent.cpp
@@ -24,8 +24,6 @@
 
 #include "modules/webaudio/AudioProcessingEvent.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 PassRefPtrWillBeRawPtr<AudioProcessingEvent> AudioProcessingEvent::create()
@@ -68,4 +66,3 @@ DEFINE_TRACE(AudioProcessingEvent)
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/modules/webaudio/AudioProcessingEvent.h b/third_party/WebKit/Source/modules/webaudio/AudioProcessingEvent.h
index efb1866..e3c35b3 100644
--- a/third_party/WebKit/Source/modules/webaudio/AudioProcessingEvent.h
+++ b/third_party/WebKit/Source/modules/webaudio/AudioProcessingEvent.h
@@ -30,8 +30,6 @@
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefPtr.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class AudioBuffer;
@@ -63,6 +61,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // AudioProcessingEvent_h
diff --git a/third_party/WebKit/Source/modules/webaudio/AudioProcessingEvent.idl b/third_party/WebKit/Source/modules/webaudio/AudioProcessingEvent.idl
index 2b81282..b897a7f 100644
--- a/third_party/WebKit/Source/modules/webaudio/AudioProcessingEvent.idl
+++ b/third_party/WebKit/Source/modules/webaudio/AudioProcessingEvent.idl
@@ -22,9 +22,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-[
-    Conditional=WEB_AUDIO
-] interface AudioProcessingEvent : Event {
+interface AudioProcessingEvent : Event {
     readonly attribute double playbackTime;
     readonly attribute AudioBuffer inputBuffer;
     readonly attribute AudioBuffer outputBuffer;
diff --git a/third_party/WebKit/Source/modules/webaudio/AudioScheduledSourceNode.cpp b/third_party/WebKit/Source/modules/webaudio/AudioScheduledSourceNode.cpp
index 9c3e17c..8823d9d 100644
--- a/third_party/WebKit/Source/modules/webaudio/AudioScheduledSourceNode.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/AudioScheduledSourceNode.cpp
@@ -23,8 +23,6 @@
  */
 
 #include "modules/webaudio/AudioScheduledSourceNode.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/dom/CrossThreadTask.h"
 #include "core/dom/ExceptionCode.h"
@@ -267,4 +265,3 @@ void AudioScheduledSourceNode::setOnended(PassRefPtrWillBeRawPtr<EventListener>
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/modules/webaudio/AudioScheduledSourceNode.h b/third_party/WebKit/Source/modules/webaudio/AudioScheduledSourceNode.h
index 7173365..ed6a530 100644
--- a/third_party/WebKit/Source/modules/webaudio/AudioScheduledSourceNode.h
+++ b/third_party/WebKit/Source/modules/webaudio/AudioScheduledSourceNode.h
@@ -31,8 +31,6 @@
 
 #include "modules/webaudio/AudioSourceNode.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class AbstractAudioContext;
@@ -139,6 +137,4 @@ protected:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // AudioScheduledSourceNode_h
diff --git a/third_party/WebKit/Source/modules/webaudio/AudioSourceNode.h b/third_party/WebKit/Source/modules/webaudio/AudioSourceNode.h
index d743554..e0c9f39 100644
--- a/third_party/WebKit/Source/modules/webaudio/AudioSourceNode.h
+++ b/third_party/WebKit/Source/modules/webaudio/AudioSourceNode.h
@@ -31,8 +31,6 @@
 
 #include "modules/webaudio/AudioNode.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class AbstractAudioContext;
@@ -46,6 +44,4 @@ public:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // AudioSourceNode_h
diff --git a/third_party/WebKit/Source/modules/webaudio/AudioSourceNode.idl b/third_party/WebKit/Source/modules/webaudio/AudioSourceNode.idl
index 7a69b79..b77c8b2 100644
--- a/third_party/WebKit/Source/modules/webaudio/AudioSourceNode.idl
+++ b/third_party/WebKit/Source/modules/webaudio/AudioSourceNode.idl
@@ -28,6 +28,5 @@
 
 [
     NoInterfaceObject,
-    Conditional=WEB_AUDIO
 ] interface AudioSourceNode : AudioNode {
 };
diff --git a/third_party/WebKit/Source/modules/webaudio/AudioSummingJunction.cpp b/third_party/WebKit/Source/modules/webaudio/AudioSummingJunction.cpp
index b9822d8..7bed7e4 100644
--- a/third_party/WebKit/Source/modules/webaudio/AudioSummingJunction.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/AudioSummingJunction.cpp
@@ -23,8 +23,6 @@
  */
 
 #include "modules/webaudio/AudioSummingJunction.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "modules/webaudio/AudioNodeOutput.h"
 #include <algorithm>
 
@@ -71,4 +69,3 @@ void AudioSummingJunction::updateRenderingState()
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/modules/webaudio/AudioSummingJunction.h b/third_party/WebKit/Source/modules/webaudio/AudioSummingJunction.h
index 4d430b5..00df509 100644
--- a/third_party/WebKit/Source/modules/webaudio/AudioSummingJunction.h
+++ b/third_party/WebKit/Source/modules/webaudio/AudioSummingJunction.h
@@ -30,8 +30,6 @@
 #include "wtf/HashSet.h"
 #include "wtf/Vector.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class AudioNodeOutput;
@@ -89,6 +87,4 @@ protected:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // AudioSummingJunction_h
diff --git a/third_party/WebKit/Source/modules/webaudio/BiquadDSPKernel.cpp b/third_party/WebKit/Source/modules/webaudio/BiquadDSPKernel.cpp
index 3f65829..cc5d423 100644
--- a/third_party/WebKit/Source/modules/webaudio/BiquadDSPKernel.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/BiquadDSPKernel.cpp
@@ -23,8 +23,6 @@
  */
 
 #include "modules/webaudio/BiquadDSPKernel.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "platform/FloatConversion.h"
 #include "wtf/Vector.h"
 #include <limits.h>
@@ -188,4 +186,3 @@ double BiquadDSPKernel::latencyTime() const
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/modules/webaudio/BiquadDSPKernel.h b/third_party/WebKit/Source/modules/webaudio/BiquadDSPKernel.h
index 94dca74..fff8fa9 100644
--- a/third_party/WebKit/Source/modules/webaudio/BiquadDSPKernel.h
+++ b/third_party/WebKit/Source/modules/webaudio/BiquadDSPKernel.h
@@ -29,8 +29,6 @@
 #include "platform/audio/AudioDSPKernel.h"
 #include "platform/audio/Biquad.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class BiquadProcessor;
@@ -72,6 +70,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // BiquadDSPKernel_h
diff --git a/third_party/WebKit/Source/modules/webaudio/BiquadFilterNode.cpp b/third_party/WebKit/Source/modules/webaudio/BiquadFilterNode.cpp
index 597ab5e..abea4f4 100644
--- a/third_party/WebKit/Source/modules/webaudio/BiquadFilterNode.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/BiquadFilterNode.cpp
@@ -23,8 +23,6 @@
  */
 
 #include "modules/webaudio/BiquadFilterNode.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "modules/webaudio/AudioBasicProcessorHandler.h"
 
 namespace blink {
@@ -118,4 +116,3 @@ void BiquadFilterNode::getFrequencyResponse(const DOMFloat32Array* frequencyHz,
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/modules/webaudio/BiquadFilterNode.h b/third_party/WebKit/Source/modules/webaudio/BiquadFilterNode.h
index adb343c..ad8ea74 100644
--- a/third_party/WebKit/Source/modules/webaudio/BiquadFilterNode.h
+++ b/third_party/WebKit/Source/modules/webaudio/BiquadFilterNode.h
@@ -29,8 +29,6 @@
 #include "modules/webaudio/AudioNode.h"
 #include "modules/webaudio/BiquadProcessor.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class AbstractAudioContext;
@@ -83,6 +81,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // BiquadFilterNode_h
diff --git a/third_party/WebKit/Source/modules/webaudio/BiquadFilterNode.idl b/third_party/WebKit/Source/modules/webaudio/BiquadFilterNode.idl
index 9783ab2..0a16aab 100644
--- a/third_party/WebKit/Source/modules/webaudio/BiquadFilterNode.idl
+++ b/third_party/WebKit/Source/modules/webaudio/BiquadFilterNode.idl
@@ -33,9 +33,7 @@ enum BiquadFilterType {
     "allpass"
 };
 
-[
-    Conditional=WEB_AUDIO
-] interface BiquadFilterNode : AudioNode {
+interface BiquadFilterNode : AudioNode {
     attribute BiquadFilterType type;
 
     readonly attribute AudioParam frequency; // in Hertz
diff --git a/third_party/WebKit/Source/modules/webaudio/BiquadProcessor.cpp b/third_party/WebKit/Source/modules/webaudio/BiquadProcessor.cpp
index 4983652..110dff4 100644
--- a/third_party/WebKit/Source/modules/webaudio/BiquadProcessor.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/BiquadProcessor.cpp
@@ -23,8 +23,6 @@
  */
 
 #include "modules/webaudio/BiquadProcessor.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "modules/webaudio/BiquadDSPKernel.h"
 
 namespace blink {
@@ -118,4 +116,3 @@ void BiquadProcessor::getFrequencyResponse(int nFrequencies, const float* freque
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/modules/webaudio/BiquadProcessor.h b/third_party/WebKit/Source/modules/webaudio/BiquadProcessor.h
index dd16a7e..8b9f8ea 100644
--- a/third_party/WebKit/Source/modules/webaudio/BiquadProcessor.h
+++ b/third_party/WebKit/Source/modules/webaudio/BiquadProcessor.h
@@ -32,8 +32,6 @@
 #include "platform/audio/Biquad.h"
 #include "wtf/RefPtr.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 // BiquadProcessor is an AudioDSPKernelProcessor which uses Biquad objects to implement several common filters.
@@ -92,6 +90,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // BiquadProcessor_h
diff --git a/third_party/WebKit/Source/modules/webaudio/ChannelMergerNode.cpp b/third_party/WebKit/Source/modules/webaudio/ChannelMergerNode.cpp
index eb01c6b..b2f54ce 100644
--- a/third_party/WebKit/Source/modules/webaudio/ChannelMergerNode.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/ChannelMergerNode.cpp
@@ -27,8 +27,6 @@
  */
 
 #include "modules/webaudio/ChannelMergerNode.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "bindings/core/v8/ExceptionMessages.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/dom/ExceptionCode.h"
@@ -136,4 +134,3 @@ ChannelMergerNode* ChannelMergerNode::create(AbstractAudioContext& context, floa
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/modules/webaudio/ChannelMergerNode.h b/third_party/WebKit/Source/modules/webaudio/ChannelMergerNode.h
index 76ef421..eaab17e 100644
--- a/third_party/WebKit/Source/modules/webaudio/ChannelMergerNode.h
+++ b/third_party/WebKit/Source/modules/webaudio/ChannelMergerNode.h
@@ -32,8 +32,6 @@
 #include "modules/webaudio/AudioNode.h"
 #include "wtf/PassRefPtr.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class AbstractAudioContext;
@@ -61,6 +59,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // ChannelMergerNode_h
diff --git a/third_party/WebKit/Source/modules/webaudio/ChannelMergerNode.idl b/third_party/WebKit/Source/modules/webaudio/ChannelMergerNode.idl
index e79ce5a..5d27dde 100644
--- a/third_party/WebKit/Source/modules/webaudio/ChannelMergerNode.idl
+++ b/third_party/WebKit/Source/modules/webaudio/ChannelMergerNode.idl
@@ -26,7 +26,5 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-[
-    Conditional=WEB_AUDIO
-] interface ChannelMergerNode : AudioNode {
+interface ChannelMergerNode : AudioNode {
 };
diff --git a/third_party/WebKit/Source/modules/webaudio/ChannelSplitterNode.cpp b/third_party/WebKit/Source/modules/webaudio/ChannelSplitterNode.cpp
index c85a133..046aa7c 100644
--- a/third_party/WebKit/Source/modules/webaudio/ChannelSplitterNode.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/ChannelSplitterNode.cpp
@@ -23,8 +23,6 @@
  */
 
 #include "modules/webaudio/ChannelSplitterNode.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "modules/webaudio/AbstractAudioContext.h"
 #include "modules/webaudio/AudioNodeInput.h"
 #include "modules/webaudio/AudioNodeOutput.h"
@@ -88,4 +86,3 @@ ChannelSplitterNode* ChannelSplitterNode::create(AbstractAudioContext& context,
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/modules/webaudio/ChannelSplitterNode.h b/third_party/WebKit/Source/modules/webaudio/ChannelSplitterNode.h
index e2b1842..5548eca 100644
--- a/third_party/WebKit/Source/modules/webaudio/ChannelSplitterNode.h
+++ b/third_party/WebKit/Source/modules/webaudio/ChannelSplitterNode.h
@@ -28,8 +28,6 @@
 #include "modules/webaudio/AudioNode.h"
 #include "wtf/PassRefPtr.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class AbstractAudioContext;
@@ -56,6 +54,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // ChannelSplitterNode_h
diff --git a/third_party/WebKit/Source/modules/webaudio/ChannelSplitterNode.idl b/third_party/WebKit/Source/modules/webaudio/ChannelSplitterNode.idl
index eabfba1..413ee74 100644
--- a/third_party/WebKit/Source/modules/webaudio/ChannelSplitterNode.idl
+++ b/third_party/WebKit/Source/modules/webaudio/ChannelSplitterNode.idl
@@ -22,7 +22,5 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-[
-    Conditional=WEB_AUDIO
-] interface ChannelSplitterNode : AudioNode {
+interface ChannelSplitterNode : AudioNode {
 };
diff --git a/third_party/WebKit/Source/modules/webaudio/ConvolverNode.cpp b/third_party/WebKit/Source/modules/webaudio/ConvolverNode.cpp
index b6efcbe..d764fd35 100644
--- a/third_party/WebKit/Source/modules/webaudio/ConvolverNode.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/ConvolverNode.cpp
@@ -23,8 +23,6 @@
  */
 
 #include "modules/webaudio/ConvolverNode.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/dom/ExceptionCode.h"
 #include "modules/webaudio/AudioBuffer.h"
@@ -206,4 +204,3 @@ void ConvolverNode::setNormalize(bool normalize)
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/modules/webaudio/ConvolverNode.h b/third_party/WebKit/Source/modules/webaudio/ConvolverNode.h
index 190753c..7ad656e 100644
--- a/third_party/WebKit/Source/modules/webaudio/ConvolverNode.h
+++ b/third_party/WebKit/Source/modules/webaudio/ConvolverNode.h
@@ -32,8 +32,6 @@
 #include "wtf/RefPtr.h"
 #include "wtf/ThreadingPrimitives.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class AudioBuffer;
@@ -93,6 +91,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // ConvolverNode_h
diff --git a/third_party/WebKit/Source/modules/webaudio/ConvolverNode.idl b/third_party/WebKit/Source/modules/webaudio/ConvolverNode.idl
index 6831fc3..e797e5c 100644
--- a/third_party/WebKit/Source/modules/webaudio/ConvolverNode.idl
+++ b/third_party/WebKit/Source/modules/webaudio/ConvolverNode.idl
@@ -23,9 +23,7 @@
  */
 
 // A linear convolution effect
-[
-    Conditional=WEB_AUDIO
-] interface ConvolverNode : AudioNode {
+interface ConvolverNode : AudioNode {
     [RaisesException=Setter] attribute AudioBuffer? buffer;
     attribute boolean normalize;
 };
diff --git a/third_party/WebKit/Source/modules/webaudio/ConvolverNodeTest.cpp b/third_party/WebKit/Source/modules/webaudio/ConvolverNodeTest.cpp
index 78630ff..04d5122 100644
--- a/third_party/WebKit/Source/modules/webaudio/ConvolverNodeTest.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/ConvolverNodeTest.cpp
@@ -3,8 +3,6 @@
 // found in the LICENSE file.
 
 #include "modules/webaudio/ConvolverNode.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "core/testing/DummyPageHolder.h"
 #include "modules/webaudio/OfflineAudioContext.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -28,4 +26,3 @@ TEST(ConvolverNodeTest, ReverbLifetime)
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/modules/webaudio/DefaultAudioDestinationNode.cpp b/third_party/WebKit/Source/modules/webaudio/DefaultAudioDestinationNode.cpp
index e2e618f..4e59e97 100644
--- a/third_party/WebKit/Source/modules/webaudio/DefaultAudioDestinationNode.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/DefaultAudioDestinationNode.cpp
@@ -23,8 +23,6 @@
  */
 
 #include "modules/webaudio/DefaultAudioDestinationNode.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "bindings/core/v8/ExceptionMessages.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/dom/ExceptionCode.h"
@@ -153,4 +151,3 @@ DefaultAudioDestinationNode* DefaultAudioDestinationNode::create(AbstractAudioCo
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/modules/webaudio/DefaultAudioDestinationNode.h b/third_party/WebKit/Source/modules/webaudio/DefaultAudioDestinationNode.h
index d0b88f1..9b6a8d2 100644
--- a/third_party/WebKit/Source/modules/webaudio/DefaultAudioDestinationNode.h
+++ b/third_party/WebKit/Source/modules/webaudio/DefaultAudioDestinationNode.h
@@ -29,8 +29,6 @@
 #include "platform/audio/AudioDestination.h"
 #include "wtf/OwnPtr.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class AbstractAudioContext;
@@ -71,6 +69,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // DefaultAudioDestinationNode_h
diff --git a/third_party/WebKit/Source/modules/webaudio/DeferredTaskHandler.cpp b/third_party/WebKit/Source/modules/webaudio/DeferredTaskHandler.cpp
index 94e77b9..b8612fc 100644
--- a/third_party/WebKit/Source/modules/webaudio/DeferredTaskHandler.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/DeferredTaskHandler.cpp
@@ -23,8 +23,6 @@
  */
 
 #include "modules/webaudio/DeferredTaskHandler.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "modules/webaudio/AudioNode.h"
 #include "modules/webaudio/AudioNodeOutput.h"
 #include "modules/webaudio/OfflineAudioContext.h"
@@ -284,4 +282,3 @@ void DeferredTaskHandler::clearHandlersToBeDeleted()
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/modules/webaudio/DeferredTaskHandler.h b/third_party/WebKit/Source/modules/webaudio/DeferredTaskHandler.h
index 10f858a..e5dd672 100644
--- a/third_party/WebKit/Source/modules/webaudio/DeferredTaskHandler.h
+++ b/third_party/WebKit/Source/modules/webaudio/DeferredTaskHandler.h
@@ -36,8 +36,6 @@
 #include "wtf/Vector.h"
 #include "wtf/build_config.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class AbstractAudioContext;
@@ -195,6 +193,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // DeferredTaskHandler_h
diff --git a/third_party/WebKit/Source/modules/webaudio/DelayDSPKernel.cpp b/third_party/WebKit/Source/modules/webaudio/DelayDSPKernel.cpp
index 0b82b36..001a5f73 100644
--- a/third_party/WebKit/Source/modules/webaudio/DelayDSPKernel.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/DelayDSPKernel.cpp
@@ -23,8 +23,6 @@
  */
 
 #include "modules/webaudio/DelayDSPKernel.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "platform/audio/AudioUtilities.h"
 #include "wtf/MathExtras.h"
 #include <algorithm>
@@ -70,4 +68,3 @@ double DelayDSPKernel::delayTime(float)
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/modules/webaudio/DelayDSPKernel.h b/third_party/WebKit/Source/modules/webaudio/DelayDSPKernel.h
index 5b423bb..dba31b6 100644
--- a/third_party/WebKit/Source/modules/webaudio/DelayDSPKernel.h
+++ b/third_party/WebKit/Source/modules/webaudio/DelayDSPKernel.h
@@ -28,8 +28,6 @@
 #include "modules/webaudio/DelayProcessor.h"
 #include "platform/audio/AudioDelayDSPKernel.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class DelayProcessor;
@@ -49,6 +47,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // DelayDSPKernel_h
diff --git a/third_party/WebKit/Source/modules/webaudio/DelayNode.cpp b/third_party/WebKit/Source/modules/webaudio/DelayNode.cpp
index 192a8a7..7e1ecc8 100644
--- a/third_party/WebKit/Source/modules/webaudio/DelayNode.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/DelayNode.cpp
@@ -23,8 +23,6 @@
  */
 
 #include "modules/webaudio/DelayNode.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "bindings/core/v8/ExceptionMessages.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/dom/ExceptionCode.h"
@@ -73,4 +71,3 @@ DEFINE_TRACE(DelayNode)
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/modules/webaudio/DelayNode.h b/third_party/WebKit/Source/modules/webaudio/DelayNode.h
index f7726da..03d0188 100644
--- a/third_party/WebKit/Source/modules/webaudio/DelayNode.h
+++ b/third_party/WebKit/Source/modules/webaudio/DelayNode.h
@@ -27,8 +27,6 @@
 
 #include "modules/webaudio/AudioNode.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class AbstractAudioContext;
@@ -49,6 +47,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // DelayNode_h
diff --git a/third_party/WebKit/Source/modules/webaudio/DelayNode.idl b/third_party/WebKit/Source/modules/webaudio/DelayNode.idl
index b5cb6eb3..a6a0f18 100644
--- a/third_party/WebKit/Source/modules/webaudio/DelayNode.idl
+++ b/third_party/WebKit/Source/modules/webaudio/DelayNode.idl
@@ -22,8 +22,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-[
-    Conditional=WEB_AUDIO
-] interface DelayNode : AudioNode {
+interface DelayNode : AudioNode {
     readonly attribute AudioParam delayTime;
 };
diff --git a/third_party/WebKit/Source/modules/webaudio/DelayProcessor.cpp b/third_party/WebKit/Source/modules/webaudio/DelayProcessor.cpp
index f0acbdc..3a35f86 100644
--- a/third_party/WebKit/Source/modules/webaudio/DelayProcessor.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/DelayProcessor.cpp
@@ -23,8 +23,6 @@
  */
 
 #include "modules/webaudio/DelayProcessor.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "modules/webaudio/DelayDSPKernel.h"
 
 namespace blink {
@@ -49,4 +47,3 @@ PassOwnPtr<AudioDSPKernel> DelayProcessor::createKernel()
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/modules/webaudio/DelayProcessor.h b/third_party/WebKit/Source/modules/webaudio/DelayProcessor.h
index 8a09d54..20278f6 100644
--- a/third_party/WebKit/Source/modules/webaudio/DelayProcessor.h
+++ b/third_party/WebKit/Source/modules/webaudio/DelayProcessor.h
@@ -30,8 +30,6 @@
 #include "wtf/PassOwnPtr.h"
 #include "wtf/RefPtr.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class AudioDSPKernel;
@@ -53,6 +51,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // DelayProcessor_h
diff --git a/third_party/WebKit/Source/modules/webaudio/DynamicsCompressorNode.cpp b/third_party/WebKit/Source/modules/webaudio/DynamicsCompressorNode.cpp
index bae6915..4be5421 100644
--- a/third_party/WebKit/Source/modules/webaudio/DynamicsCompressorNode.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/DynamicsCompressorNode.cpp
@@ -23,8 +23,6 @@
  */
 
 #include "modules/webaudio/DynamicsCompressorNode.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "modules/webaudio/AudioNodeInput.h"
 #include "modules/webaudio/AudioNodeOutput.h"
 #include "platform/audio/DynamicsCompressor.h"
@@ -180,4 +178,3 @@ AudioParam* DynamicsCompressorNode::release() const
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/modules/webaudio/DynamicsCompressorNode.h b/third_party/WebKit/Source/modules/webaudio/DynamicsCompressorNode.h
index eba4ff8..7c1f64d 100644
--- a/third_party/WebKit/Source/modules/webaudio/DynamicsCompressorNode.h
+++ b/third_party/WebKit/Source/modules/webaudio/DynamicsCompressorNode.h
@@ -31,8 +31,6 @@
 #include "modules/webaudio/AudioParam.h"
 #include "wtf/OwnPtr.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class AbstractAudioContext;
@@ -93,6 +91,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // DynamicsCompressorNode_h
diff --git a/third_party/WebKit/Source/modules/webaudio/DynamicsCompressorNode.idl b/third_party/WebKit/Source/modules/webaudio/DynamicsCompressorNode.idl
index 6be99d0..b6a6633 100644
--- a/third_party/WebKit/Source/modules/webaudio/DynamicsCompressorNode.idl
+++ b/third_party/WebKit/Source/modules/webaudio/DynamicsCompressorNode.idl
@@ -22,9 +22,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-[
-    Conditional=WEB_AUDIO
-] interface DynamicsCompressorNode : AudioNode {
+interface DynamicsCompressorNode : AudioNode {
     readonly attribute AudioParam threshold; // in Decibels
     readonly attribute AudioParam knee; // in Decibels
     readonly attribute AudioParam ratio; // unit-less
diff --git a/third_party/WebKit/Source/modules/webaudio/DynamicsCompressorNodeTest.cpp b/third_party/WebKit/Source/modules/webaudio/DynamicsCompressorNodeTest.cpp
index ca2fd0e..67bd8b7 100644
--- a/third_party/WebKit/Source/modules/webaudio/DynamicsCompressorNodeTest.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/DynamicsCompressorNodeTest.cpp
@@ -3,8 +3,6 @@
 // found in the LICENSE file.
 
 #include "modules/webaudio/DynamicsCompressorNode.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "core/testing/DummyPageHolder.h"
 #include "modules/webaudio/AbstractAudioContext.h"
 #include "modules/webaudio/OfflineAudioContext.h"
@@ -28,4 +26,3 @@ TEST(DynamicsCompressorNodeTest, ProcessorLifetime)
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/modules/webaudio/GainNode.cpp b/third_party/WebKit/Source/modules/webaudio/GainNode.cpp
index 0638a4e..581becb 100644
--- a/third_party/WebKit/Source/modules/webaudio/GainNode.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/GainNode.cpp
@@ -23,8 +23,6 @@
  */
 
 #include "modules/webaudio/GainNode.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "modules/webaudio/AudioNodeInput.h"
 #include "modules/webaudio/AudioNodeOutput.h"
 #include "platform/audio/AudioBus.h"
@@ -141,4 +139,3 @@ DEFINE_TRACE(GainNode)
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/modules/webaudio/GainNode.h b/third_party/WebKit/Source/modules/webaudio/GainNode.h
index 1b6d859..da401a6 100644
--- a/third_party/WebKit/Source/modules/webaudio/GainNode.h
+++ b/third_party/WebKit/Source/modules/webaudio/GainNode.h
@@ -30,8 +30,6 @@
 #include "wtf/PassRefPtr.h"
 #include "wtf/Threading.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class AbstractAudioContext;
@@ -74,6 +72,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // GainNode_h
diff --git a/third_party/WebKit/Source/modules/webaudio/GainNode.idl b/third_party/WebKit/Source/modules/webaudio/GainNode.idl
index 0f1a88e..60f5fdd 100644
--- a/third_party/WebKit/Source/modules/webaudio/GainNode.idl
+++ b/third_party/WebKit/Source/modules/webaudio/GainNode.idl
@@ -22,9 +22,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-[
-    Conditional=WEB_AUDIO
-] interface GainNode : AudioNode {
+interface GainNode : AudioNode {
     // FIXME: eventually it will be interesting to remove the readonly restriction, but need to properly deal with thread safety here.
     readonly attribute AudioParam gain;
 };
diff --git a/third_party/WebKit/Source/modules/webaudio/MediaElementAudioSourceNode.cpp b/third_party/WebKit/Source/modules/webaudio/MediaElementAudioSourceNode.cpp
index ec46954..d97620d 100644
--- a/third_party/WebKit/Source/modules/webaudio/MediaElementAudioSourceNode.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/MediaElementAudioSourceNode.cpp
@@ -23,8 +23,6 @@
  */
 
 #include "modules/webaudio/MediaElementAudioSourceNode.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "core/dom/CrossThreadTask.h"
 #include "core/frame/ConsoleTypes.h"
 #include "core/html/HTMLMediaElement.h"
@@ -255,4 +253,3 @@ void MediaElementAudioSourceNode::unlock()
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/modules/webaudio/MediaElementAudioSourceNode.h b/third_party/WebKit/Source/modules/webaudio/MediaElementAudioSourceNode.h
index 81e9f2b..fa5edd3 100644
--- a/third_party/WebKit/Source/modules/webaudio/MediaElementAudioSourceNode.h
+++ b/third_party/WebKit/Source/modules/webaudio/MediaElementAudioSourceNode.h
@@ -32,8 +32,6 @@
 #include "wtf/PassRefPtr.h"
 #include "wtf/ThreadingPrimitives.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class AbstractAudioContext;
@@ -120,6 +118,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // MediaElementAudioSourceNode_h
diff --git a/third_party/WebKit/Source/modules/webaudio/MediaElementAudioSourceNode.idl b/third_party/WebKit/Source/modules/webaudio/MediaElementAudioSourceNode.idl
index 196eddd..8f96e41 100644
--- a/third_party/WebKit/Source/modules/webaudio/MediaElementAudioSourceNode.idl
+++ b/third_party/WebKit/Source/modules/webaudio/MediaElementAudioSourceNode.idl
@@ -22,8 +22,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-[
-    Conditional=WEB_AUDIO
-] interface MediaElementAudioSourceNode : AudioSourceNode {
+interface MediaElementAudioSourceNode : AudioSourceNode {
     readonly attribute HTMLMediaElement mediaElement;
 };
diff --git a/third_party/WebKit/Source/modules/webaudio/MediaStreamAudioDestinationNode.cpp b/third_party/WebKit/Source/modules/webaudio/MediaStreamAudioDestinationNode.cpp
index 3ed8520..b66b24e 100644
--- a/third_party/WebKit/Source/modules/webaudio/MediaStreamAudioDestinationNode.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/MediaStreamAudioDestinationNode.cpp
@@ -23,8 +23,6 @@
  */
 
 #include "modules/webaudio/MediaStreamAudioDestinationNode.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "bindings/core/v8/ExceptionMessages.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/dom/ExceptionCode.h"
@@ -136,4 +134,3 @@ MediaStream* MediaStreamAudioDestinationNode::stream() const
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/modules/webaudio/MediaStreamAudioDestinationNode.h b/third_party/WebKit/Source/modules/webaudio/MediaStreamAudioDestinationNode.h
index 5667fc9..0f034ab 100644
--- a/third_party/WebKit/Source/modules/webaudio/MediaStreamAudioDestinationNode.h
+++ b/third_party/WebKit/Source/modules/webaudio/MediaStreamAudioDestinationNode.h
@@ -31,8 +31,6 @@
 #include "wtf/OwnPtr.h"
 #include "wtf/PassRefPtr.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class AbstractAudioContext;
@@ -76,6 +74,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // MediaStreamAudioDestinationNode_h
diff --git a/third_party/WebKit/Source/modules/webaudio/MediaStreamAudioDestinationNode.idl b/third_party/WebKit/Source/modules/webaudio/MediaStreamAudioDestinationNode.idl
index 6bca078..971e607 100644
--- a/third_party/WebKit/Source/modules/webaudio/MediaStreamAudioDestinationNode.idl
+++ b/third_party/WebKit/Source/modules/webaudio/MediaStreamAudioDestinationNode.idl
@@ -22,8 +22,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-[
-    Conditional=WEB_AUDIO
-] interface MediaStreamAudioDestinationNode : AudioNode {
+interface MediaStreamAudioDestinationNode : AudioNode {
     readonly attribute MediaStream stream;
 };
diff --git a/third_party/WebKit/Source/modules/webaudio/MediaStreamAudioSourceNode.cpp b/third_party/WebKit/Source/modules/webaudio/MediaStreamAudioSourceNode.cpp
index 2337b82..4c1b3e8 100644
--- a/third_party/WebKit/Source/modules/webaudio/MediaStreamAudioSourceNode.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/MediaStreamAudioSourceNode.cpp
@@ -23,8 +23,6 @@
  */
 
 #include "modules/webaudio/MediaStreamAudioSourceNode.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "modules/webaudio/AbstractAudioContext.h"
 #include "modules/webaudio/AudioNodeOutput.h"
 #include "platform/Logging.h"
@@ -144,4 +142,3 @@ void MediaStreamAudioSourceNode::setFormat(size_t numberOfChannels, float source
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/modules/webaudio/MediaStreamAudioSourceNode.h b/third_party/WebKit/Source/modules/webaudio/MediaStreamAudioSourceNode.h
index a2b73c8..d082be8 100644
--- a/third_party/WebKit/Source/modules/webaudio/MediaStreamAudioSourceNode.h
+++ b/third_party/WebKit/Source/modules/webaudio/MediaStreamAudioSourceNode.h
@@ -33,8 +33,6 @@
 #include "wtf/PassRefPtr.h"
 #include "wtf/Threading.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class AbstractAudioContext;
@@ -90,6 +88,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // MediaStreamAudioSourceNode_h
diff --git a/third_party/WebKit/Source/modules/webaudio/MediaStreamAudioSourceNode.idl b/third_party/WebKit/Source/modules/webaudio/MediaStreamAudioSourceNode.idl
index 78f29df..6da028b 100644
--- a/third_party/WebKit/Source/modules/webaudio/MediaStreamAudioSourceNode.idl
+++ b/third_party/WebKit/Source/modules/webaudio/MediaStreamAudioSourceNode.idl
@@ -22,8 +22,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-[
-    Conditional=WEB_AUDIO
-] interface MediaStreamAudioSourceNode : AudioSourceNode {
+interface MediaStreamAudioSourceNode : AudioSourceNode {
     readonly attribute MediaStream mediaStream;
 };
diff --git a/third_party/WebKit/Source/modules/webaudio/OfflineAudioCompletionEvent.cpp b/third_party/WebKit/Source/modules/webaudio/OfflineAudioCompletionEvent.cpp
index 09b0b83..1dcea79 100644
--- a/third_party/WebKit/Source/modules/webaudio/OfflineAudioCompletionEvent.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/OfflineAudioCompletionEvent.cpp
@@ -24,8 +24,6 @@
 
 #include "modules/webaudio/OfflineAudioCompletionEvent.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 PassRefPtrWillBeRawPtr<OfflineAudioCompletionEvent> OfflineAudioCompletionEvent::create()
@@ -65,4 +63,3 @@ DEFINE_TRACE(OfflineAudioCompletionEvent)
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/modules/webaudio/OfflineAudioCompletionEvent.h b/third_party/WebKit/Source/modules/webaudio/OfflineAudioCompletionEvent.h
index 38e3941..f1c9864 100644
--- a/third_party/WebKit/Source/modules/webaudio/OfflineAudioCompletionEvent.h
+++ b/third_party/WebKit/Source/modules/webaudio/OfflineAudioCompletionEvent.h
@@ -30,8 +30,6 @@
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefPtr.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class AudioBuffer;
@@ -59,6 +57,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // OfflineAudioCompletionEvent_h
diff --git a/third_party/WebKit/Source/modules/webaudio/OfflineAudioCompletionEvent.idl b/third_party/WebKit/Source/modules/webaudio/OfflineAudioCompletionEvent.idl
index a3fbc72..6529fac 100644
--- a/third_party/WebKit/Source/modules/webaudio/OfflineAudioCompletionEvent.idl
+++ b/third_party/WebKit/Source/modules/webaudio/OfflineAudioCompletionEvent.idl
@@ -22,8 +22,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-[
-    Conditional=WEB_AUDIO
-] interface OfflineAudioCompletionEvent : Event {
+interface OfflineAudioCompletionEvent : Event {
     readonly attribute AudioBuffer renderedBuffer;
 };
diff --git a/third_party/WebKit/Source/modules/webaudio/OfflineAudioContext.cpp b/third_party/WebKit/Source/modules/webaudio/OfflineAudioContext.cpp
index 44a9e1d..1ac7fe9 100644
--- a/third_party/WebKit/Source/modules/webaudio/OfflineAudioContext.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/OfflineAudioContext.cpp
@@ -23,8 +23,6 @@
  */
 
 #include "modules/webaudio/OfflineAudioContext.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "bindings/core/v8/ExceptionMessages.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptState.h"
@@ -398,4 +396,3 @@ bool OfflineAudioContext::shouldSuspend()
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/modules/webaudio/OfflineAudioContext.h b/third_party/WebKit/Source/modules/webaudio/OfflineAudioContext.h
index 6c4ad87..85d99d7 100644
--- a/third_party/WebKit/Source/modules/webaudio/OfflineAudioContext.h
+++ b/third_party/WebKit/Source/modules/webaudio/OfflineAudioContext.h
@@ -29,8 +29,6 @@
 #include "modules/webaudio/AbstractAudioContext.h"
 #include "wtf/HashMap.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class ExceptionState;
@@ -117,6 +115,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // OfflineAudioContext_h
diff --git a/third_party/WebKit/Source/modules/webaudio/OfflineAudioContext.idl b/third_party/WebKit/Source/modules/webaudio/OfflineAudioContext.idl
index 0b12e30..1f91f8f 100644
--- a/third_party/WebKit/Source/modules/webaudio/OfflineAudioContext.idl
+++ b/third_party/WebKit/Source/modules/webaudio/OfflineAudioContext.idl
@@ -23,7 +23,6 @@
  */
 
 [
-    Conditional=WEB_AUDIO,
     Constructor(unsigned long numberOfChannels, unsigned long numberOfFrames, float sampleRate),
     ConstructorCallWith=ExecutionContext,
     RaisesException=Constructor,
diff --git a/third_party/WebKit/Source/modules/webaudio/OfflineAudioDestinationNode.cpp b/third_party/WebKit/Source/modules/webaudio/OfflineAudioDestinationNode.cpp
index 3ec7d5b..8ae9cf4 100644
--- a/third_party/WebKit/Source/modules/webaudio/OfflineAudioDestinationNode.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/OfflineAudioDestinationNode.cpp
@@ -23,8 +23,6 @@
  */
 
 #include "modules/webaudio/OfflineAudioDestinationNode.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "core/dom/CrossThreadTask.h"
 #include "modules/webaudio/AbstractAudioContext.h"
 #include "modules/webaudio/AudioNodeInput.h"
@@ -303,4 +301,3 @@ OfflineAudioDestinationNode* OfflineAudioDestinationNode::create(AbstractAudioCo
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/modules/webaudio/OfflineAudioDestinationNode.h b/third_party/WebKit/Source/modules/webaudio/OfflineAudioDestinationNode.h
index 4a7a067..b900a92 100644
--- a/third_party/WebKit/Source/modules/webaudio/OfflineAudioDestinationNode.h
+++ b/third_party/WebKit/Source/modules/webaudio/OfflineAudioDestinationNode.h
@@ -32,8 +32,6 @@
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefPtr.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class AbstractAudioContext;
@@ -125,6 +123,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // OfflineAudioDestinationNode_h
diff --git a/third_party/WebKit/Source/modules/webaudio/OscillatorNode.cpp b/third_party/WebKit/Source/modules/webaudio/OscillatorNode.cpp
index 31c9221..6d8dd46 100644
--- a/third_party/WebKit/Source/modules/webaudio/OscillatorNode.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/OscillatorNode.cpp
@@ -23,8 +23,6 @@
  */
 
 #include "modules/webaudio/OscillatorNode.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "bindings/core/v8/ExceptionMessages.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/dom/ExceptionCode.h"
@@ -395,4 +393,3 @@ void OscillatorNode::setPeriodicWave(PeriodicWave* wave)
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/modules/webaudio/OscillatorNode.h b/third_party/WebKit/Source/modules/webaudio/OscillatorNode.h
index 4a4920b..d80f27d 100644
--- a/third_party/WebKit/Source/modules/webaudio/OscillatorNode.h
+++ b/third_party/WebKit/Source/modules/webaudio/OscillatorNode.h
@@ -33,8 +33,6 @@
 #include "wtf/RefPtr.h"
 #include "wtf/Threading.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class AbstractAudioContext;
@@ -121,6 +119,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // OscillatorNode_h
diff --git a/third_party/WebKit/Source/modules/webaudio/OscillatorNode.idl b/third_party/WebKit/Source/modules/webaudio/OscillatorNode.idl
index 203abfe..0440252 100644
--- a/third_party/WebKit/Source/modules/webaudio/OscillatorNode.idl
+++ b/third_party/WebKit/Source/modules/webaudio/OscillatorNode.idl
@@ -31,9 +31,7 @@ enum OscillatorType {
 };
 
 // OscillatorNode is an audio generator of periodic waveforms.
-[
-    Conditional=WEB_AUDIO,
-] interface OscillatorNode : AudioSourceNode {
+interface OscillatorNode : AudioSourceNode {
 
     [RaisesException=Setter] attribute OscillatorType type;
 
diff --git a/third_party/WebKit/Source/modules/webaudio/PannerNode.cpp b/third_party/WebKit/Source/modules/webaudio/PannerNode.cpp
index 3a4758e..7bdf21e 100644
--- a/third_party/WebKit/Source/modules/webaudio/PannerNode.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/PannerNode.cpp
@@ -23,8 +23,6 @@
  */
 
 #include "modules/webaudio/PannerNode.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "bindings/core/v8/ExceptionMessages.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/dom/ExceptionCode.h"
@@ -692,4 +690,3 @@ void PannerNode::setConeOuterGain(double gain)
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/modules/webaudio/PannerNode.h b/third_party/WebKit/Source/modules/webaudio/PannerNode.h
index 2d1d53d..c7050af 100644
--- a/third_party/WebKit/Source/modules/webaudio/PannerNode.h
+++ b/third_party/WebKit/Source/modules/webaudio/PannerNode.h
@@ -34,8 +34,6 @@
 #include "platform/geometry/FloatPoint3D.h"
 #include "wtf/HashMap.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class AbstractAudioContext;
@@ -189,6 +187,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // PannerNode_h
diff --git a/third_party/WebKit/Source/modules/webaudio/PannerNode.idl b/third_party/WebKit/Source/modules/webaudio/PannerNode.idl
index 4cb9ae5..d69f4d6 100644
--- a/third_party/WebKit/Source/modules/webaudio/PannerNode.idl
+++ b/third_party/WebKit/Source/modules/webaudio/PannerNode.idl
@@ -35,7 +35,6 @@ enum DistanceModelType {
 
 [
     NoInterfaceObject,
-    Conditional=WEB_AUDIO,
 ] interface PannerNode : AudioNode {
     // Default model for stereo is equalpower.
     attribute PanningModelType panningModel;
diff --git a/third_party/WebKit/Source/modules/webaudio/PeriodicWave.cpp b/third_party/WebKit/Source/modules/webaudio/PeriodicWave.cpp
index 8258560..7bfedbe 100644
--- a/third_party/WebKit/Source/modules/webaudio/PeriodicWave.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/PeriodicWave.cpp
@@ -27,8 +27,6 @@
  */
 
 #include "modules/webaudio/PeriodicWave.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "modules/webaudio/OscillatorNode.h"
 #include "platform/audio/FFTFrame.h"
 #include "platform/audio/VectorMath.h"
@@ -316,4 +314,3 @@ void PeriodicWave::generateBasicWaveform(int shape)
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/modules/webaudio/PeriodicWave.h b/third_party/WebKit/Source/modules/webaudio/PeriodicWave.h
index b7e31b7..7c99629 100644
--- a/third_party/WebKit/Source/modules/webaudio/PeriodicWave.h
+++ b/third_party/WebKit/Source/modules/webaudio/PeriodicWave.h
@@ -35,8 +35,6 @@
 #include "wtf/Forward.h"
 #include "wtf/Vector.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class PeriodicWave : public GarbageCollectedFinalized<PeriodicWave>, public ScriptWrappable {
@@ -97,6 +95,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // PeriodicWave_h
diff --git a/third_party/WebKit/Source/modules/webaudio/PeriodicWave.idl b/third_party/WebKit/Source/modules/webaudio/PeriodicWave.idl
index 46a5474..bf70cbd 100644
--- a/third_party/WebKit/Source/modules/webaudio/PeriodicWave.idl
+++ b/third_party/WebKit/Source/modules/webaudio/PeriodicWave.idl
@@ -24,8 +24,7 @@
 
 // PeriodicWave represents a periodic audio waveform given by its Fourier coefficients.
 [
-    GarbageCollected,
-    Conditional=WEB_AUDIO
+    GarbageCollected
 ] interface PeriodicWave {
 
 };
diff --git a/third_party/WebKit/Source/modules/webaudio/RealtimeAnalyser.cpp b/third_party/WebKit/Source/modules/webaudio/RealtimeAnalyser.cpp
index 1177722..ff73910 100644
--- a/third_party/WebKit/Source/modules/webaudio/RealtimeAnalyser.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/RealtimeAnalyser.cpp
@@ -23,8 +23,6 @@
  */
 
 #include "modules/webaudio/RealtimeAnalyser.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "platform/audio/AudioBus.h"
 #include "platform/audio/AudioUtilities.h"
 #include "platform/audio/VectorMath.h"
@@ -309,4 +307,3 @@ void RealtimeAnalyser::getByteTimeDomainData(DOMUint8Array* destinationArray)
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/modules/webaudio/RealtimeAnalyser.h b/third_party/WebKit/Source/modules/webaudio/RealtimeAnalyser.h
index 8615a2f..98ec2ee 100644
--- a/third_party/WebKit/Source/modules/webaudio/RealtimeAnalyser.h
+++ b/third_party/WebKit/Source/modules/webaudio/RealtimeAnalyser.h
@@ -31,8 +31,6 @@
 #include "wtf/Noncopyable.h"
 #include "wtf/OwnPtr.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class AudioBus;
@@ -97,6 +95,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // RealtimeAnalyser_h
diff --git a/third_party/WebKit/Source/modules/webaudio/ScriptProcessorNode.cpp b/third_party/WebKit/Source/modules/webaudio/ScriptProcessorNode.cpp
index 615e596..c89091f 100644
--- a/third_party/WebKit/Source/modules/webaudio/ScriptProcessorNode.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/ScriptProcessorNode.cpp
@@ -23,8 +23,6 @@
  */
 
 #include "modules/webaudio/ScriptProcessorNode.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/dom/CrossThreadTask.h"
 #include "core/dom/ExceptionCode.h"
@@ -298,4 +296,3 @@ size_t ScriptProcessorNode::bufferSize() const
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/modules/webaudio/ScriptProcessorNode.h b/third_party/WebKit/Source/modules/webaudio/ScriptProcessorNode.h
index 96e5800..dbb58cf 100644
--- a/third_party/WebKit/Source/modules/webaudio/ScriptProcessorNode.h
+++ b/third_party/WebKit/Source/modules/webaudio/ScriptProcessorNode.h
@@ -33,8 +33,6 @@
 #include "wtf/RefPtr.h"
 #include "wtf/Vector.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class AbstractAudioContext;
@@ -114,6 +112,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // ScriptProcessorNode_h
diff --git a/third_party/WebKit/Source/modules/webaudio/ScriptProcessorNode.idl b/third_party/WebKit/Source/modules/webaudio/ScriptProcessorNode.idl
index bc000b9..382e384 100644
--- a/third_party/WebKit/Source/modules/webaudio/ScriptProcessorNode.idl
+++ b/third_party/WebKit/Source/modules/webaudio/ScriptProcessorNode.idl
@@ -23,9 +23,7 @@
  */
 
 // For real-time audio stream synthesis/processing in JavaScript
-[
-    Conditional=WEB_AUDIO
-] interface ScriptProcessorNode : AudioNode {
+interface ScriptProcessorNode : AudioNode {
     // Rendering callback
     attribute EventHandler onaudioprocess;
 
diff --git a/third_party/WebKit/Source/modules/webaudio/ScriptProcessorNodeTest.cpp b/third_party/WebKit/Source/modules/webaudio/ScriptProcessorNodeTest.cpp
index d7fe6c5..db38a7d 100644
--- a/third_party/WebKit/Source/modules/webaudio/ScriptProcessorNodeTest.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/ScriptProcessorNodeTest.cpp
@@ -3,8 +3,6 @@
 // found in the LICENSE file.
 
 #include "modules/webaudio/ScriptProcessorNode.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "core/testing/DummyPageHolder.h"
 #include "modules/webaudio/OfflineAudioContext.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -29,4 +27,3 @@ TEST(ScriptProcessorNodeTest, BufferLifetime)
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/modules/webaudio/StereoPannerNode.cpp b/third_party/WebKit/Source/modules/webaudio/StereoPannerNode.cpp
index 95beb2c6..0692d9f 100644
--- a/third_party/WebKit/Source/modules/webaudio/StereoPannerNode.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/StereoPannerNode.cpp
@@ -3,8 +3,6 @@
 // found in the LICENSE file.
 
 #include "modules/webaudio/StereoPannerNode.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "bindings/core/v8/ExceptionMessages.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/dom/ExceptionCode.h"
@@ -161,4 +159,3 @@ AudioParam* StereoPannerNode::pan() const
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/modules/webaudio/StereoPannerNode.h b/third_party/WebKit/Source/modules/webaudio/StereoPannerNode.h
index e248662..16283e6 100644
--- a/third_party/WebKit/Source/modules/webaudio/StereoPannerNode.h
+++ b/third_party/WebKit/Source/modules/webaudio/StereoPannerNode.h
@@ -11,8 +11,6 @@
 #include "platform/audio/AudioBus.h"
 #include "platform/audio/Spatializer.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class AbstractAudioContext;
@@ -57,6 +55,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // StereoPannerNode_h
diff --git a/third_party/WebKit/Source/modules/webaudio/StereoPannerNode.idl b/third_party/WebKit/Source/modules/webaudio/StereoPannerNode.idl
index 74f2354..d0a7776 100644
--- a/third_party/WebKit/Source/modules/webaudio/StereoPannerNode.idl
+++ b/third_party/WebKit/Source/modules/webaudio/StereoPannerNode.idl
@@ -4,7 +4,6 @@
 
 [
     NoInterfaceObject,
-    Conditional=WEB_AUDIO
 ] interface StereoPannerNode : AudioNode {
 
     readonly attribute AudioParam pan;
diff --git a/third_party/WebKit/Source/modules/webaudio/StereoPannerNodeTest.cpp b/third_party/WebKit/Source/modules/webaudio/StereoPannerNodeTest.cpp
index b7852a6..a195c09 100644
--- a/third_party/WebKit/Source/modules/webaudio/StereoPannerNodeTest.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/StereoPannerNodeTest.cpp
@@ -3,8 +3,6 @@
 // found in the LICENSE file.
 
 #include "modules/webaudio/StereoPannerNode.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "core/testing/DummyPageHolder.h"
 #include "modules/webaudio/OfflineAudioContext.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -27,4 +25,3 @@ TEST(StereoPannerNodeTest, StereoPannerLifetime)
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/modules/webaudio/WaveShaperDSPKernel.cpp b/third_party/WebKit/Source/modules/webaudio/WaveShaperDSPKernel.cpp
index dae48d5..a5ed118 100644
--- a/third_party/WebKit/Source/modules/webaudio/WaveShaperDSPKernel.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/WaveShaperDSPKernel.cpp
@@ -23,8 +23,6 @@
  */
 
 #include "modules/webaudio/WaveShaperDSPKernel.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "wtf/MainThread.h"
 #include "wtf/Threading.h"
 #include <algorithm>
@@ -205,4 +203,3 @@ double WaveShaperDSPKernel::latencyTime() const
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/modules/webaudio/WaveShaperDSPKernel.h b/third_party/WebKit/Source/modules/webaudio/WaveShaperDSPKernel.h
index fd01ce1..e75be26 100644
--- a/third_party/WebKit/Source/modules/webaudio/WaveShaperDSPKernel.h
+++ b/third_party/WebKit/Source/modules/webaudio/WaveShaperDSPKernel.h
@@ -32,8 +32,6 @@
 #include "platform/audio/UpSampler.h"
 #include "wtf/OwnPtr.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class WaveShaperProcessor;
@@ -74,6 +72,4 @@ protected:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // WaveShaperDSPKernel_h
diff --git a/third_party/WebKit/Source/modules/webaudio/WaveShaperNode.cpp b/third_party/WebKit/Source/modules/webaudio/WaveShaperNode.cpp
index d9795fa..6a82ba2 100644
--- a/third_party/WebKit/Source/modules/webaudio/WaveShaperNode.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/WaveShaperNode.cpp
@@ -23,8 +23,6 @@
  */
 
 #include "modules/webaudio/WaveShaperNode.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "bindings/core/v8/ExceptionMessages.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/dom/ExceptionCode.h"
@@ -106,4 +104,3 @@ String WaveShaperNode::oversample() const
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/modules/webaudio/WaveShaperNode.h b/third_party/WebKit/Source/modules/webaudio/WaveShaperNode.h
index 901c4ed..fb05ea3 100644
--- a/third_party/WebKit/Source/modules/webaudio/WaveShaperNode.h
+++ b/third_party/WebKit/Source/modules/webaudio/WaveShaperNode.h
@@ -29,8 +29,6 @@
 #include "modules/webaudio/AudioNode.h"
 #include "modules/webaudio/WaveShaperProcessor.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class AbstractAudioContext;
@@ -59,6 +57,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // WaveShaperNode_h
diff --git a/third_party/WebKit/Source/modules/webaudio/WaveShaperNode.idl b/third_party/WebKit/Source/modules/webaudio/WaveShaperNode.idl
index 49ff1cc..aeca5fb 100644
--- a/third_party/WebKit/Source/modules/webaudio/WaveShaperNode.idl
+++ b/third_party/WebKit/Source/modules/webaudio/WaveShaperNode.idl
@@ -28,9 +28,7 @@ enum OverSampleType {
     "4x"
 };
 
-[
-    Conditional=WEB_AUDIO
-] interface WaveShaperNode : AudioNode {
+interface WaveShaperNode : AudioNode {
     [RaisesException=Setter] attribute Float32Array? curve;
     attribute OverSampleType oversample;
 };
diff --git a/third_party/WebKit/Source/modules/webaudio/WaveShaperProcessor.cpp b/third_party/WebKit/Source/modules/webaudio/WaveShaperProcessor.cpp
index da2faa8..a289cb7 100644
--- a/third_party/WebKit/Source/modules/webaudio/WaveShaperProcessor.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/WaveShaperProcessor.cpp
@@ -23,8 +23,6 @@
  */
 
 #include "modules/webaudio/WaveShaperProcessor.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "modules/webaudio/WaveShaperDSPKernel.h"
 
 namespace blink {
@@ -95,4 +93,3 @@ void WaveShaperProcessor::process(const AudioBus* source, AudioBus* destination,
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/modules/webaudio/WaveShaperProcessor.h b/third_party/WebKit/Source/modules/webaudio/WaveShaperProcessor.h
index c984103..8d38bd3 100644
--- a/third_party/WebKit/Source/modules/webaudio/WaveShaperProcessor.h
+++ b/third_party/WebKit/Source/modules/webaudio/WaveShaperProcessor.h
@@ -32,8 +32,6 @@
 #include "wtf/RefPtr.h"
 #include "wtf/ThreadingPrimitives.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 // WaveShaperProcessor is an AudioDSPKernelProcessor which uses WaveShaperDSPKernel objects to implement non-linear distortion effects.
@@ -69,6 +67,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // WaveShaperProcessor_h
diff --git a/third_party/WebKit/Source/modules/webaudio/WindowWebAudio.idl b/third_party/WebKit/Source/modules/webaudio/WindowWebAudio.idl
index 01e4618..b2ac6d9 100644
--- a/third_party/WebKit/Source/modules/webaudio/WindowWebAudio.idl
+++ b/third_party/WebKit/Source/modules/webaudio/WindowWebAudio.idl
@@ -5,8 +5,8 @@
 [
     ImplementedAs=DOMWindowWebAudio,
 ] partial interface Window {
-    [MeasureAs=AudioContext, Conditional=WEB_AUDIO, RuntimeEnabled=WebAudio] attribute AudioContextConstructor AudioContext;
-    [MeasureAs=OfflineAudioContext, Conditional=WEB_AUDIO, RuntimeEnabled=WebAudio] attribute OfflineAudioContextConstructor OfflineAudioContext;
-    [DeprecateAs=PrefixedAudioContext, Conditional=WEB_AUDIO, RuntimeEnabled=WebAudio] attribute AudioContextConstructor webkitAudioContext;
-    [DeprecateAs=PrefixedOfflineAudioContext, Conditional=WEB_AUDIO, RuntimeEnabled=WebAudio] attribute OfflineAudioContextConstructor webkitOfflineAudioContext;
+    [MeasureAs=AudioContext, RuntimeEnabled=WebAudio] attribute AudioContextConstructor AudioContext;
+    [MeasureAs=OfflineAudioContext, RuntimeEnabled=WebAudio] attribute OfflineAudioContextConstructor OfflineAudioContext;
+    [DeprecateAs=PrefixedAudioContext, RuntimeEnabled=WebAudio] attribute AudioContextConstructor webkitAudioContext;
+    [DeprecateAs=PrefixedOfflineAudioContext, RuntimeEnabled=WebAudio] attribute OfflineAudioContextConstructor webkitOfflineAudioContext;
 };
diff --git a/third_party/WebKit/Source/platform/RuntimeEnabledFeatures.in b/third_party/WebKit/Source/platform/RuntimeEnabledFeatures.in
index b3d0ff0..cd9572f 100644
--- a/third_party/WebKit/Source/platform/RuntimeEnabledFeatures.in
+++ b/third_party/WebKit/Source/platform/RuntimeEnabledFeatures.in
@@ -202,7 +202,7 @@ UnsandboxedAuxiliary status=stable
 UserSelectAll status=experimental
 WebAnimationsAPI status=experimental
 WebAnimationsSVG status=experimental
-WebAudio condition=WEB_AUDIO, status=stable
+WebAudio status=stable
 WebBluetooth
 WebGLDraftExtensions status=experimental
 WebGLImageChromium
diff --git a/third_party/WebKit/Source/platform/audio/AudioArray.h b/third_party/WebKit/Source/platform/audio/AudioArray.h
index 2bed6ba..32304f4 100644
--- a/third_party/WebKit/Source/platform/audio/AudioArray.h
+++ b/third_party/WebKit/Source/platform/audio/AudioArray.h
@@ -35,8 +35,6 @@
 #include "wtf/build_config.h"
 #include <string.h>
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 template<typename T>
@@ -163,6 +161,4 @@ typedef AudioArray<double> AudioDoubleArray;
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // AudioArray_h
diff --git a/third_party/WebKit/Source/platform/audio/AudioBus.cpp b/third_party/WebKit/Source/platform/audio/AudioBus.cpp
index 201d7cf..2b29e70 100644
--- a/third_party/WebKit/Source/platform/audio/AudioBus.cpp
+++ b/third_party/WebKit/Source/platform/audio/AudioBus.cpp
@@ -27,8 +27,6 @@
  */
 
 #include "platform/audio/AudioBus.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "platform/audio/AudioFileReader.h"
 #include "platform/audio/DenormalDisabler.h"
 #include "platform/audio/SincResampler.h"
@@ -685,4 +683,3 @@ PassRefPtr<AudioBus> createBusFromInMemoryAudioFile(const void* data, size_t dat
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/platform/audio/AudioBus.h b/third_party/WebKit/Source/platform/audio/AudioBus.h
index f5133aa..5657f4f 100644
--- a/third_party/WebKit/Source/platform/audio/AudioBus.h
+++ b/third_party/WebKit/Source/platform/audio/AudioBus.h
@@ -35,8 +35,6 @@
 #include "wtf/ThreadSafeRefCounted.h"
 #include "wtf/Vector.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 // An AudioBus represents a collection of one or more AudioChannels.
@@ -170,6 +168,4 @@ protected:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // AudioBus_h
diff --git a/third_party/WebKit/Source/platform/audio/AudioChannel.cpp b/third_party/WebKit/Source/platform/audio/AudioChannel.cpp
index ecd92c0..9c8edc63 100644
--- a/third_party/WebKit/Source/platform/audio/AudioChannel.cpp
+++ b/third_party/WebKit/Source/platform/audio/AudioChannel.cpp
@@ -27,8 +27,6 @@
  */
 
 #include "platform/audio/AudioChannel.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "platform/audio/VectorMath.h"
 #include "wtf/OwnPtr.h"
 #include <algorithm>
@@ -127,4 +125,3 @@ float AudioChannel::maxAbsValue() const
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/platform/audio/AudioChannel.h b/third_party/WebKit/Source/platform/audio/AudioChannel.h
index 9863efb..a1fb5ad 100644
--- a/third_party/WebKit/Source/platform/audio/AudioChannel.h
+++ b/third_party/WebKit/Source/platform/audio/AudioChannel.h
@@ -34,8 +34,6 @@
 #include "wtf/Allocator.h"
 #include "wtf/PassOwnPtr.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 // An AudioChannel represents a buffer of non-interleaved floating-point audio samples.
@@ -141,6 +139,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // AudioChannel_h
diff --git a/third_party/WebKit/Source/platform/audio/AudioDSPKernel.cpp b/third_party/WebKit/Source/platform/audio/AudioDSPKernel.cpp
index 5da376c..94718fd 100644
--- a/third_party/WebKit/Source/platform/audio/AudioDSPKernel.cpp
+++ b/third_party/WebKit/Source/platform/audio/AudioDSPKernel.cpp
@@ -30,8 +30,6 @@
 
 #include "platform/audio/AudioDSPKernel.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 AudioDSPKernel::~AudioDSPKernel()
@@ -40,4 +38,3 @@ AudioDSPKernel::~AudioDSPKernel()
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/platform/audio/AudioDSPKernel.h b/third_party/WebKit/Source/platform/audio/AudioDSPKernel.h
index 0d5263d..4946657 100644
--- a/third_party/WebKit/Source/platform/audio/AudioDSPKernel.h
+++ b/third_party/WebKit/Source/platform/audio/AudioDSPKernel.h
@@ -34,8 +34,6 @@
 #include "platform/audio/AudioDSPKernelProcessor.h"
 #include "wtf/Allocator.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 // AudioDSPKernel does the processing for one channel of an AudioDSPKernelProcessor.
@@ -79,6 +77,4 @@ protected:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // AudioDSPKernel_h
diff --git a/third_party/WebKit/Source/platform/audio/AudioDSPKernelProcessor.cpp b/third_party/WebKit/Source/platform/audio/AudioDSPKernelProcessor.cpp
index ed6267e..cad473e 100644
--- a/third_party/WebKit/Source/platform/audio/AudioDSPKernelProcessor.cpp
+++ b/third_party/WebKit/Source/platform/audio/AudioDSPKernelProcessor.cpp
@@ -29,8 +29,6 @@
  */
 
 #include "platform/audio/AudioDSPKernelProcessor.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "platform/audio/AudioDSPKernel.h"
 #include "wtf/MainThread.h"
 
@@ -151,4 +149,3 @@ double AudioDSPKernelProcessor::latencyTime() const
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/platform/audio/AudioDSPKernelProcessor.h b/third_party/WebKit/Source/platform/audio/AudioDSPKernelProcessor.h
index 7e2cc8d..ac02a9c 100644
--- a/third_party/WebKit/Source/platform/audio/AudioDSPKernelProcessor.h
+++ b/third_party/WebKit/Source/platform/audio/AudioDSPKernelProcessor.h
@@ -38,8 +38,6 @@
 #include "wtf/ThreadingPrimitives.h"
 #include "wtf/Vector.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class AudioBus;
@@ -78,6 +76,4 @@ protected:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // AudioDSPKernelProcessor_h
diff --git a/third_party/WebKit/Source/platform/audio/AudioDelayDSPKernel.cpp b/third_party/WebKit/Source/platform/audio/AudioDelayDSPKernel.cpp
index da66e2b..de7e6b9 100644
--- a/third_party/WebKit/Source/platform/audio/AudioDelayDSPKernel.cpp
+++ b/third_party/WebKit/Source/platform/audio/AudioDelayDSPKernel.cpp
@@ -23,8 +23,6 @@
  */
 
 #include "platform/audio/AudioDelayDSPKernel.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "platform/audio/AudioUtilities.h"
 #include "wtf/MathExtras.h"
 #include <cmath>
@@ -172,4 +170,3 @@ double AudioDelayDSPKernel::latencyTime() const
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/platform/audio/AudioDelayDSPKernel.h b/third_party/WebKit/Source/platform/audio/AudioDelayDSPKernel.h
index f99043f..4b7fd19 100644
--- a/third_party/WebKit/Source/platform/audio/AudioDelayDSPKernel.h
+++ b/third_party/WebKit/Source/platform/audio/AudioDelayDSPKernel.h
@@ -28,8 +28,6 @@
 #include "platform/audio/AudioArray.h"
 #include "platform/audio/AudioDSPKernel.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class PLATFORM_EXPORT AudioDelayDSPKernel : public AudioDSPKernel {
@@ -68,6 +66,4 @@ protected:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // AudioDelayDSPKernel_h
diff --git a/third_party/WebKit/Source/platform/audio/AudioDestination.cpp b/third_party/WebKit/Source/platform/audio/AudioDestination.cpp
index 4552523..3eccc8a 100644
--- a/third_party/WebKit/Source/platform/audio/AudioDestination.cpp
+++ b/third_party/WebKit/Source/platform/audio/AudioDestination.cpp
@@ -27,8 +27,6 @@
  */
 
 #include "platform/audio/AudioDestination.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "platform/audio/AudioFIFO.h"
 #include "platform/audio/AudioPullFIFO.h"
 #include "public/platform/Platform.h"
@@ -174,4 +172,3 @@ void AudioDestination::provideInput(AudioBus* bus, size_t framesToProcess)
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/platform/audio/AudioDestination.h b/third_party/WebKit/Source/platform/audio/AudioDestination.h
index 45874a0..03a483b 100644
--- a/third_party/WebKit/Source/platform/audio/AudioDestination.h
+++ b/third_party/WebKit/Source/platform/audio/AudioDestination.h
@@ -38,8 +38,6 @@
 #include "wtf/Noncopyable.h"
 #include "wtf/text/WTFString.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class AudioFIFO;
@@ -96,6 +94,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // AudioDestination_h
diff --git a/third_party/WebKit/Source/platform/audio/AudioFIFO.cpp b/third_party/WebKit/Source/platform/audio/AudioFIFO.cpp
index ef4e044..78cf0b2 100644
--- a/third_party/WebKit/Source/platform/audio/AudioFIFO.cpp
+++ b/third_party/WebKit/Source/platform/audio/AudioFIFO.cpp
@@ -28,8 +28,6 @@
 
 #include "platform/audio/AudioFIFO.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 AudioFIFO::AudioFIFO(unsigned numberOfChannels, size_t fifoLength)
@@ -139,4 +137,3 @@ void AudioFIFO::findWrapLengths(size_t index, size_t size, size_t& part1Length,
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/platform/audio/AudioFIFO.h b/third_party/WebKit/Source/platform/audio/AudioFIFO.h
index 4df631c..b676991 100644
--- a/third_party/WebKit/Source/platform/audio/AudioFIFO.h
+++ b/third_party/WebKit/Source/platform/audio/AudioFIFO.h
@@ -32,8 +32,6 @@
 #include "platform/audio/AudioBus.h"
 #include "wtf/Allocator.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class AudioFIFO {
@@ -77,6 +75,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // AudioFIFO.h
diff --git a/third_party/WebKit/Source/platform/audio/AudioPullFIFO.cpp b/third_party/WebKit/Source/platform/audio/AudioPullFIFO.cpp
index ad510d3..33a48d3 100644
--- a/third_party/WebKit/Source/platform/audio/AudioPullFIFO.cpp
+++ b/third_party/WebKit/Source/platform/audio/AudioPullFIFO.cpp
@@ -28,8 +28,6 @@
 
 #include "platform/audio/AudioPullFIFO.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 AudioPullFIFO::AudioPullFIFO(AudioSourceProvider& audioProvider, unsigned numberOfChannels, size_t fifoLength, size_t providerSize)
@@ -70,4 +68,3 @@ void AudioPullFIFO::fillBuffer(size_t numberOfFrames)
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/platform/audio/AudioPullFIFO.h b/third_party/WebKit/Source/platform/audio/AudioPullFIFO.h
index 83cf8a5..015eeac 100644
--- a/third_party/WebKit/Source/platform/audio/AudioPullFIFO.h
+++ b/third_party/WebKit/Source/platform/audio/AudioPullFIFO.h
@@ -34,8 +34,6 @@
 #include "platform/audio/AudioSourceProvider.h"
 #include "wtf/Allocator.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 // A FIFO (First In First Out) buffer to handle mismatches in buffer sizes between a provider and
@@ -76,6 +74,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // AudioPullFIFO.h
diff --git a/third_party/WebKit/Source/platform/audio/AudioResampler.cpp b/third_party/WebKit/Source/platform/audio/AudioResampler.cpp
index 9009e8b..175a5e1 100644
--- a/third_party/WebKit/Source/platform/audio/AudioResampler.cpp
+++ b/third_party/WebKit/Source/platform/audio/AudioResampler.cpp
@@ -23,8 +23,6 @@
  */
 
 #include "platform/audio/AudioResampler.h"
-
-#if ENABLE(WEB_AUDIO)
 #include <algorithm>
 #include "wtf/MathExtras.h"
 
@@ -119,4 +117,3 @@ void AudioResampler::reset()
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/platform/audio/AudioResampler.h b/third_party/WebKit/Source/platform/audio/AudioResampler.h
index 4c31d0e..5fc4636 100644
--- a/third_party/WebKit/Source/platform/audio/AudioResampler.h
+++ b/third_party/WebKit/Source/platform/audio/AudioResampler.h
@@ -33,8 +33,6 @@
 #include "wtf/OwnPtr.h"
 #include "wtf/Vector.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 // AudioResampler resamples the audio stream from an AudioSourceProvider.
@@ -71,6 +69,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // AudioResampler_h
diff --git a/third_party/WebKit/Source/platform/audio/AudioResamplerKernel.cpp b/third_party/WebKit/Source/platform/audio/AudioResamplerKernel.cpp
index 8d23451..4be909c 100644
--- a/third_party/WebKit/Source/platform/audio/AudioResamplerKernel.cpp
+++ b/third_party/WebKit/Source/platform/audio/AudioResamplerKernel.cpp
@@ -23,8 +23,6 @@
  */
 
 #include "platform/audio/AudioResamplerKernel.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "platform/audio/AudioResampler.h"
 #include "wtf/MathExtras.h"
 
@@ -134,4 +132,3 @@ double AudioResamplerKernel::rate() const
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/platform/audio/AudioResamplerKernel.h b/third_party/WebKit/Source/platform/audio/AudioResamplerKernel.h
index 2eac6eb..82bfeff 100644
--- a/third_party/WebKit/Source/platform/audio/AudioResamplerKernel.h
+++ b/third_party/WebKit/Source/platform/audio/AudioResamplerKernel.h
@@ -29,8 +29,6 @@
 #include "platform/audio/AudioArray.h"
 #include "wtf/Allocator.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class AudioResampler;
@@ -79,6 +77,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // AudioResamplerKernel_h
diff --git a/third_party/WebKit/Source/platform/audio/AudioUtilities.cpp b/third_party/WebKit/Source/platform/audio/AudioUtilities.cpp
index b079a87..0b32724 100644
--- a/third_party/WebKit/Source/platform/audio/AudioUtilities.cpp
+++ b/third_party/WebKit/Source/platform/audio/AudioUtilities.cpp
@@ -23,8 +23,6 @@
  */
 
 #include "platform/audio/AudioUtilities.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "wtf/Assertions.h"
 #include "wtf/MathExtras.h"
 
@@ -79,4 +77,3 @@ float maxAudioBufferSampleRate()
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/platform/audio/AudioUtilities.h b/third_party/WebKit/Source/platform/audio/AudioUtilities.h
index 2f4f933..537af67 100644
--- a/third_party/WebKit/Source/platform/audio/AudioUtilities.h
+++ b/third_party/WebKit/Source/platform/audio/AudioUtilities.h
@@ -29,8 +29,6 @@
 #include "wtf/build_config.h"
 #include <cstddef>
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 namespace AudioUtilities {
 
@@ -55,6 +53,4 @@ PLATFORM_EXPORT float maxAudioBufferSampleRate();
 } // AudioUtilites
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // AudioUtilities_h
diff --git a/third_party/WebKit/Source/platform/audio/Biquad.cpp b/third_party/WebKit/Source/platform/audio/Biquad.cpp
index ffa469f..d48b721 100644
--- a/third_party/WebKit/Source/platform/audio/Biquad.cpp
+++ b/third_party/WebKit/Source/platform/audio/Biquad.cpp
@@ -27,8 +27,6 @@
  */
 
 #include "platform/audio/Biquad.h"
-
-#if ENABLE(WEB_AUDIO)
 #include <stdio.h>
 #include <algorithm>
 #include "platform/audio/DenormalDisabler.h"
@@ -564,4 +562,3 @@ void Biquad::getFrequencyResponse(int nFrequencies,
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/platform/audio/Biquad.h b/third_party/WebKit/Source/platform/audio/Biquad.h
index b8a6d3b..dab9821 100644
--- a/third_party/WebKit/Source/platform/audio/Biquad.h
+++ b/third_party/WebKit/Source/platform/audio/Biquad.h
@@ -39,8 +39,6 @@
 #include <ipps.h>
 #endif // USE(WEBAUDIO_IPP)
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 // A basic biquad (two-zero / two-pole digital filter)
@@ -111,6 +109,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // Biquad_h
diff --git a/third_party/WebKit/Source/platform/audio/Cone.cpp b/third_party/WebKit/Source/platform/audio/Cone.cpp
index df301f8..c72d656 100644
--- a/third_party/WebKit/Source/platform/audio/Cone.cpp
+++ b/third_party/WebKit/Source/platform/audio/Cone.cpp
@@ -27,8 +27,6 @@
  */
 
 #include "platform/audio/Cone.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "wtf/MathExtras.h"
 
 namespace blink {
@@ -75,4 +73,3 @@ double ConeEffect::gain(FloatPoint3D sourcePosition, FloatPoint3D sourceOrientat
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/platform/audio/Cone.h b/third_party/WebKit/Source/platform/audio/Cone.h
index 4a73774..ae57444 100644
--- a/third_party/WebKit/Source/platform/audio/Cone.h
+++ b/third_party/WebKit/Source/platform/audio/Cone.h
@@ -34,8 +34,6 @@
 #include "wtf/Allocator.h"
 #include "wtf/build_config.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 // Cone gain is defined according to the OpenAL specification
@@ -66,6 +64,4 @@ protected:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // Cone_h
diff --git a/third_party/WebKit/Source/platform/audio/DirectConvolver.cpp b/third_party/WebKit/Source/platform/audio/DirectConvolver.cpp
index dd63327..fae54b5 100644
--- a/third_party/WebKit/Source/platform/audio/DirectConvolver.cpp
+++ b/third_party/WebKit/Source/platform/audio/DirectConvolver.cpp
@@ -28,7 +28,6 @@
 
 #include "platform/audio/DirectConvolver.h"
 
-#if ENABLE(WEB_AUDIO)
 #if OS(MACOSX)
 #include <Accelerate/Accelerate.h>
 #endif
@@ -429,4 +428,3 @@ void DirectConvolver::reset()
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/platform/audio/DirectConvolver.h b/third_party/WebKit/Source/platform/audio/DirectConvolver.h
index 6b3e277..ad16f94 100644
--- a/third_party/WebKit/Source/platform/audio/DirectConvolver.h
+++ b/third_party/WebKit/Source/platform/audio/DirectConvolver.h
@@ -38,8 +38,6 @@
 #include <ipps.h>
 #endif // USE(WEBAUDIO_IPP)
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class PLATFORM_EXPORT DirectConvolver {
@@ -63,6 +61,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // DirectConvolver_h
diff --git a/third_party/WebKit/Source/platform/audio/Distance.cpp b/third_party/WebKit/Source/platform/audio/Distance.cpp
index 3569051..81b6eee 100644
--- a/third_party/WebKit/Source/platform/audio/Distance.cpp
+++ b/third_party/WebKit/Source/platform/audio/Distance.cpp
@@ -27,8 +27,6 @@
  */
 
 #include "platform/audio/Distance.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "wtf/Assertions.h"
 #include <math.h>
 #include <algorithm>
@@ -84,4 +82,3 @@ double DistanceEffect::exponentialGain(double distance)
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/platform/audio/Distance.h b/third_party/WebKit/Source/platform/audio/Distance.h
index 54f7a36..7ca2a80 100644
--- a/third_party/WebKit/Source/platform/audio/Distance.h
+++ b/third_party/WebKit/Source/platform/audio/Distance.h
@@ -33,8 +33,6 @@
 #include "wtf/Allocator.h"
 #include "wtf/build_config.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 // Distance models are defined according to the OpenAL specification:
@@ -85,6 +83,4 @@ protected:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // Distance_h
diff --git a/third_party/WebKit/Source/platform/audio/DownSampler.cpp b/third_party/WebKit/Source/platform/audio/DownSampler.cpp
index 61722a6..29fce52 100644
--- a/third_party/WebKit/Source/platform/audio/DownSampler.cpp
+++ b/third_party/WebKit/Source/platform/audio/DownSampler.cpp
@@ -29,8 +29,6 @@
  */
 
 #include "platform/audio/DownSampler.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "wtf/MathExtras.h"
 
 namespace blink {
@@ -145,4 +143,3 @@ size_t DownSampler::latencyFrames() const
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/platform/audio/DownSampler.h b/third_party/WebKit/Source/platform/audio/DownSampler.h
index 674189b..bf9977b 100644
--- a/third_party/WebKit/Source/platform/audio/DownSampler.h
+++ b/third_party/WebKit/Source/platform/audio/DownSampler.h
@@ -36,8 +36,6 @@
 #include "wtf/Allocator.h"
 #include "wtf/Noncopyable.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 // DownSampler down-samples the source stream by a factor of 2x.
@@ -77,6 +75,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // DownSampler_h
diff --git a/third_party/WebKit/Source/platform/audio/DynamicsCompressor.cpp b/third_party/WebKit/Source/platform/audio/DynamicsCompressor.cpp
index 016dfaf..2658a87 100644
--- a/third_party/WebKit/Source/platform/audio/DynamicsCompressor.cpp
+++ b/third_party/WebKit/Source/platform/audio/DynamicsCompressor.cpp
@@ -27,8 +27,6 @@
  */
 
 #include "platform/audio/DynamicsCompressor.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "platform/audio/AudioBus.h"
 #include "platform/audio/AudioUtilities.h"
 #include "wtf/MathExtras.h"
@@ -206,4 +204,3 @@ void DynamicsCompressor::setNumberOfChannels(unsigned numberOfChannels)
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/platform/audio/DynamicsCompressor.h b/third_party/WebKit/Source/platform/audio/DynamicsCompressor.h
index f8ef802..a27ec22 100644
--- a/third_party/WebKit/Source/platform/audio/DynamicsCompressor.h
+++ b/third_party/WebKit/Source/platform/audio/DynamicsCompressor.h
@@ -36,8 +36,6 @@
 #include "wtf/Noncopyable.h"
 #include "wtf/OwnPtr.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class AudioBus;
@@ -109,6 +107,4 @@ protected:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // DynamicsCompressor_h
diff --git a/third_party/WebKit/Source/platform/audio/DynamicsCompressorKernel.cpp b/third_party/WebKit/Source/platform/audio/DynamicsCompressorKernel.cpp
index 3bbd761..b14075a 100644
--- a/third_party/WebKit/Source/platform/audio/DynamicsCompressorKernel.cpp
+++ b/third_party/WebKit/Source/platform/audio/DynamicsCompressorKernel.cpp
@@ -27,8 +27,6 @@
  */
 
 #include "platform/audio/DynamicsCompressorKernel.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "platform/audio/AudioUtilities.h"
 #include "platform/audio/DenormalDisabler.h"
 #include "wtf/MathExtras.h"
@@ -471,4 +469,3 @@ void DynamicsCompressorKernel::reset()
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/platform/audio/DynamicsCompressorKernel.h b/third_party/WebKit/Source/platform/audio/DynamicsCompressorKernel.h
index 853080d..bb8ef41 100644
--- a/third_party/WebKit/Source/platform/audio/DynamicsCompressorKernel.h
+++ b/third_party/WebKit/Source/platform/audio/DynamicsCompressorKernel.h
@@ -36,8 +36,6 @@
 #include "wtf/OwnPtr.h"
 #include "wtf/PassOwnPtr.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class PLATFORM_EXPORT DynamicsCompressorKernel {
@@ -132,6 +130,4 @@ protected:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // DynamicsCompressorKernel_h
diff --git a/third_party/WebKit/Source/platform/audio/EqualPowerPanner.cpp b/third_party/WebKit/Source/platform/audio/EqualPowerPanner.cpp
index fafe832..968fee7 100644
--- a/third_party/WebKit/Source/platform/audio/EqualPowerPanner.cpp
+++ b/third_party/WebKit/Source/platform/audio/EqualPowerPanner.cpp
@@ -23,8 +23,6 @@
  */
 
 #include "platform/audio/EqualPowerPanner.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "platform/audio/AudioBus.h"
 #include "platform/audio/AudioUtilities.h"
 #include "wtf/MathExtras.h"
@@ -151,4 +149,3 @@ void EqualPowerPanner::pan(double azimuth, double /*elevation*/, const AudioBus*
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/platform/audio/EqualPowerPanner.h b/third_party/WebKit/Source/platform/audio/EqualPowerPanner.h
index d70db29..418dd8c 100644
--- a/third_party/WebKit/Source/platform/audio/EqualPowerPanner.h
+++ b/third_party/WebKit/Source/platform/audio/EqualPowerPanner.h
@@ -27,8 +27,6 @@
 
 #include "platform/audio/Panner.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 // Common type of stereo panner as found in normal audio mixing equipment.
@@ -55,6 +53,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // EqualPowerPanner_h
diff --git a/third_party/WebKit/Source/platform/audio/FFTConvolver.cpp b/third_party/WebKit/Source/platform/audio/FFTConvolver.cpp
index 44b23ad..ccac1bd 100644
--- a/third_party/WebKit/Source/platform/audio/FFTConvolver.cpp
+++ b/third_party/WebKit/Source/platform/audio/FFTConvolver.cpp
@@ -27,8 +27,6 @@
  */
 
 #include "platform/audio/FFTConvolver.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "platform/audio/VectorMath.h"
 
 namespace blink {
@@ -114,4 +112,3 @@ void FFTConvolver::reset()
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/platform/audio/FFTConvolver.h b/third_party/WebKit/Source/platform/audio/FFTConvolver.h
index c7efbdc..7a268c4 100644
--- a/third_party/WebKit/Source/platform/audio/FFTConvolver.h
+++ b/third_party/WebKit/Source/platform/audio/FFTConvolver.h
@@ -34,8 +34,6 @@
 #include "wtf/Allocator.h"
 #include "wtf/Noncopyable.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class PLATFORM_EXPORT FFTConvolver {
@@ -74,6 +72,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // FFTConvolver_h
diff --git a/third_party/WebKit/Source/platform/audio/FFTFrame.cpp b/third_party/WebKit/Source/platform/audio/FFTFrame.cpp
index 9b41838..76534ed 100644
--- a/third_party/WebKit/Source/platform/audio/FFTFrame.cpp
+++ b/third_party/WebKit/Source/platform/audio/FFTFrame.cpp
@@ -27,8 +27,6 @@
  */
 
 #include "platform/audio/FFTFrame.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "platform/audio/VectorMath.h"
 #include "platform/Logging.h"
 #include "wtf/MathExtras.h"
@@ -269,4 +267,3 @@ void FFTFrame::multiply(const FFTFrame& frame)
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/platform/audio/FFTFrame.h b/third_party/WebKit/Source/platform/audio/FFTFrame.h
index 16b4ec2..20dea0f2 100644
--- a/third_party/WebKit/Source/platform/audio/FFTFrame.h
+++ b/third_party/WebKit/Source/platform/audio/FFTFrame.h
@@ -46,8 +46,6 @@ struct RDFTContext;
 #include <ipps.h>
 #endif
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 // Defines the interface for an "FFT frame", an object which is able to perform a forward
@@ -120,6 +118,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // FFTFrame_h
diff --git a/third_party/WebKit/Source/platform/audio/FFTFrameStub.cpp b/third_party/WebKit/Source/platform/audio/FFTFrameStub.cpp
index 352a564..9c347931 100644
--- a/third_party/WebKit/Source/platform/audio/FFTFrameStub.cpp
+++ b/third_party/WebKit/Source/platform/audio/FFTFrameStub.cpp
@@ -27,8 +27,6 @@
 
 #include "wtf/build_config.h"
 
-#if ENABLE(WEB_AUDIO)
-
 #if !OS(MACOSX) && !USE(WEBAUDIO_FFMPEG) && !USE(WEBAUDIO_IPP) && !USE(WEBAUDIO_OPENMAX_DL_FFT)
 
 #include "platform/audio/FFTFrame.h"
@@ -87,4 +85,3 @@ void FFTFrame::cleanup()
 
 #endif // !OS(MACOSX) && !USE(WEBAUDIO_FFMPEG) && !USE(WEBAUDIO_IPP) && !USE(WEBAUDIO_OPENMAX_DL_FFT)
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/platform/audio/HRTFDatabase.cpp b/third_party/WebKit/Source/platform/audio/HRTFDatabase.cpp
index 1615f33..a45f194 100644
--- a/third_party/WebKit/Source/platform/audio/HRTFDatabase.cpp
+++ b/third_party/WebKit/Source/platform/audio/HRTFDatabase.cpp
@@ -28,8 +28,6 @@
 
 #include "platform/audio/HRTFDatabase.h"
 
-#if ENABLE(WEB_AUDIO)
-
 #include "wtf/MathExtras.h"
 
 namespace blink {
@@ -116,4 +114,3 @@ unsigned HRTFDatabase::indexFromElevationAngle(double elevationAngle)
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/platform/audio/HRTFDatabase.h b/third_party/WebKit/Source/platform/audio/HRTFDatabase.h
index 15db13d..1674f90 100644
--- a/third_party/WebKit/Source/platform/audio/HRTFDatabase.h
+++ b/third_party/WebKit/Source/platform/audio/HRTFDatabase.h
@@ -37,8 +37,6 @@
 #include "wtf/PassRefPtr.h"
 #include "wtf/Vector.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class HRTFKernel;
@@ -86,6 +84,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // HRTFDatabase_h
diff --git a/third_party/WebKit/Source/platform/audio/HRTFDatabaseLoader.cpp b/third_party/WebKit/Source/platform/audio/HRTFDatabaseLoader.cpp
index 94c9654..4b53bf8 100644
--- a/third_party/WebKit/Source/platform/audio/HRTFDatabaseLoader.cpp
+++ b/third_party/WebKit/Source/platform/audio/HRTFDatabaseLoader.cpp
@@ -27,8 +27,6 @@
  */
 
 #include "platform/audio/HRTFDatabaseLoader.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "platform/Task.h"
 #include "platform/TaskSynchronizer.h"
 #include "platform/ThreadSafeFunctional.h"
@@ -128,4 +126,3 @@ void HRTFDatabaseLoader::waitForLoaderThreadCompletion()
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/platform/audio/HRTFDatabaseLoader.h b/third_party/WebKit/Source/platform/audio/HRTFDatabaseLoader.h
index 615029e..2b63088 100644
--- a/third_party/WebKit/Source/platform/audio/HRTFDatabaseLoader.h
+++ b/third_party/WebKit/Source/platform/audio/HRTFDatabaseLoader.h
@@ -35,8 +35,6 @@
 #include "wtf/RefCounted.h"
 #include "wtf/ThreadingPrimitives.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class TaskSynchronizer;
@@ -87,6 +85,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // HRTFDatabaseLoader_h
diff --git a/third_party/WebKit/Source/platform/audio/HRTFElevation.cpp b/third_party/WebKit/Source/platform/audio/HRTFElevation.cpp
index fc78fe5..3792288 100644
--- a/third_party/WebKit/Source/platform/audio/HRTFElevation.cpp
+++ b/third_party/WebKit/Source/platform/audio/HRTFElevation.cpp
@@ -27,8 +27,6 @@
  */
 
 #include "platform/audio/HRTFElevation.h"
-
-#if ENABLE(WEB_AUDIO)
 #include <math.h>
 #include <algorithm>
 #include "platform/audio/AudioBus.h"
@@ -326,4 +324,3 @@ void HRTFElevation::getKernelsFromAzimuth(double azimuthBlend, unsigned azimuthI
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/platform/audio/HRTFElevation.h b/third_party/WebKit/Source/platform/audio/HRTFElevation.h
index 3b7f559..f9c74f7 100644
--- a/third_party/WebKit/Source/platform/audio/HRTFElevation.h
+++ b/third_party/WebKit/Source/platform/audio/HRTFElevation.h
@@ -40,8 +40,6 @@
 #include "wtf/text/CString.h"
 #include "wtf/text/WTFString.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 // HRTFElevation contains all of the HRTFKernels (one left ear and one right ear per azimuth angle) for a particular elevation.
@@ -106,6 +104,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // HRTFElevation_h
diff --git a/third_party/WebKit/Source/platform/audio/HRTFKernel.cpp b/third_party/WebKit/Source/platform/audio/HRTFKernel.cpp
index 8ae0a19..722fb66 100644
--- a/third_party/WebKit/Source/platform/audio/HRTFKernel.cpp
+++ b/third_party/WebKit/Source/platform/audio/HRTFKernel.cpp
@@ -27,8 +27,6 @@
  */
 
 #include "platform/audio/HRTFKernel.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "platform/audio/AudioChannel.h"
 #include "platform/FloatConversion.h"
 #include "wtf/MathExtras.h"
@@ -128,4 +126,3 @@ PassOwnPtr<HRTFKernel> HRTFKernel::createInterpolatedKernel(HRTFKernel* kernel1,
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/platform/audio/HRTFKernel.h b/third_party/WebKit/Source/platform/audio/HRTFKernel.h
index f525461..bbe0ac0 100644
--- a/third_party/WebKit/Source/platform/audio/HRTFKernel.h
+++ b/third_party/WebKit/Source/platform/audio/HRTFKernel.h
@@ -39,8 +39,6 @@
 #include "wtf/RefPtr.h"
 #include "wtf/Vector.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class AudioChannel;
@@ -101,6 +99,4 @@ typedef Vector<OwnPtr<HRTFKernel>> HRTFKernelList;
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // HRTFKernel_h
diff --git a/third_party/WebKit/Source/platform/audio/HRTFPanner.cpp b/third_party/WebKit/Source/platform/audio/HRTFPanner.cpp
index dc164cb..e352f45 100644
--- a/third_party/WebKit/Source/platform/audio/HRTFPanner.cpp
+++ b/third_party/WebKit/Source/platform/audio/HRTFPanner.cpp
@@ -23,8 +23,6 @@
  */
 
 #include "platform/audio/HRTFPanner.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "platform/audio/AudioBus.h"
 #include "platform/audio/AudioUtilities.h"
 #include "platform/audio/HRTFDatabase.h"
@@ -311,4 +309,3 @@ double HRTFPanner::latencyTime() const
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/platform/audio/HRTFPanner.h b/third_party/WebKit/Source/platform/audio/HRTFPanner.h
index 76d79d2..84f7585 100644
--- a/third_party/WebKit/Source/platform/audio/HRTFPanner.h
+++ b/third_party/WebKit/Source/platform/audio/HRTFPanner.h
@@ -30,8 +30,6 @@
 #include "platform/audio/HRTFDatabaseLoader.h"
 #include "platform/audio/Panner.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class PLATFORM_EXPORT HRTFPanner final : public Panner {
@@ -108,6 +106,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // HRTFPanner_h
diff --git a/third_party/WebKit/Source/platform/audio/MultiChannelResampler.cpp b/third_party/WebKit/Source/platform/audio/MultiChannelResampler.cpp
index 2b858d1..e8b7168 100644
--- a/third_party/WebKit/Source/platform/audio/MultiChannelResampler.cpp
+++ b/third_party/WebKit/Source/platform/audio/MultiChannelResampler.cpp
@@ -27,8 +27,6 @@
  */
 
 #include "platform/audio/MultiChannelResampler.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "platform/audio/AudioBus.h"
 
 namespace blink {
@@ -117,4 +115,3 @@ void MultiChannelResampler::process(AudioSourceProvider* provider, AudioBus* des
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/platform/audio/MultiChannelResampler.h b/third_party/WebKit/Source/platform/audio/MultiChannelResampler.h
index 041efc2..2888e08 100644
--- a/third_party/WebKit/Source/platform/audio/MultiChannelResampler.h
+++ b/third_party/WebKit/Source/platform/audio/MultiChannelResampler.h
@@ -34,8 +34,6 @@
 #include "wtf/Noncopyable.h"
 #include "wtf/OwnPtr.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class AudioBus;
@@ -62,6 +60,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // MultiChannelResampler_h
diff --git a/third_party/WebKit/Source/platform/audio/Panner.cpp b/third_party/WebKit/Source/platform/audio/Panner.cpp
index 1bccc47..363999d 100644
--- a/third_party/WebKit/Source/platform/audio/Panner.cpp
+++ b/third_party/WebKit/Source/platform/audio/Panner.cpp
@@ -27,8 +27,6 @@
  */
 
 #include "platform/audio/Panner.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "platform/audio/EqualPowerPanner.h"
 #include "platform/audio/HRTFPanner.h"
 
@@ -51,4 +49,3 @@ PassOwnPtr<Panner> Panner::create(PanningModel model, float sampleRate, HRTFData
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/platform/audio/Panner.h b/third_party/WebKit/Source/platform/audio/Panner.h
index 85a9455..84662f0 100644
--- a/third_party/WebKit/Source/platform/audio/Panner.h
+++ b/third_party/WebKit/Source/platform/audio/Panner.h
@@ -35,8 +35,6 @@
 #include "wtf/PassOwnPtr.h"
 #include "wtf/build_config.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class AudioBus;
@@ -76,6 +74,4 @@ protected:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // Panner_h
diff --git a/third_party/WebKit/Source/platform/audio/Reverb.cpp b/third_party/WebKit/Source/platform/audio/Reverb.cpp
index ba9ad8e..f920f04 100644
--- a/third_party/WebKit/Source/platform/audio/Reverb.cpp
+++ b/third_party/WebKit/Source/platform/audio/Reverb.cpp
@@ -27,8 +27,6 @@
  */
 
 #include "platform/audio/Reverb.h"
-
-#if ENABLE(WEB_AUDIO)
 #include <math.h>
 #include "platform/audio/AudioBus.h"
 #include "platform/audio/VectorMath.h"
@@ -235,4 +233,3 @@ size_t Reverb::latencyFrames() const
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/platform/audio/Reverb.h b/third_party/WebKit/Source/platform/audio/Reverb.h
index 7ee915a..1fb29a8 100644
--- a/third_party/WebKit/Source/platform/audio/Reverb.h
+++ b/third_party/WebKit/Source/platform/audio/Reverb.h
@@ -34,8 +34,6 @@
 #include "wtf/Noncopyable.h"
 #include "wtf/Vector.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class AudioBus;
@@ -70,6 +68,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // Reverb_h
diff --git a/third_party/WebKit/Source/platform/audio/ReverbAccumulationBuffer.cpp b/third_party/WebKit/Source/platform/audio/ReverbAccumulationBuffer.cpp
index 62a8237..488dcc4 100644
--- a/third_party/WebKit/Source/platform/audio/ReverbAccumulationBuffer.cpp
+++ b/third_party/WebKit/Source/platform/audio/ReverbAccumulationBuffer.cpp
@@ -27,8 +27,6 @@
  */
 
 #include "platform/audio/ReverbAccumulationBuffer.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "platform/audio/VectorMath.h"
 
 namespace blink {
@@ -113,4 +111,3 @@ void ReverbAccumulationBuffer::reset()
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/platform/audio/ReverbAccumulationBuffer.h b/third_party/WebKit/Source/platform/audio/ReverbAccumulationBuffer.h
index 3b8f7ac..0433b03 100644
--- a/third_party/WebKit/Source/platform/audio/ReverbAccumulationBuffer.h
+++ b/third_party/WebKit/Source/platform/audio/ReverbAccumulationBuffer.h
@@ -34,8 +34,6 @@
 #include "wtf/Allocator.h"
 #include "wtf/Noncopyable.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 // ReverbAccumulationBuffer is a circular delay buffer with one client reading from it and multiple clients
@@ -71,6 +69,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // ReverbAccumulationBuffer_h
diff --git a/third_party/WebKit/Source/platform/audio/ReverbConvolver.cpp b/third_party/WebKit/Source/platform/audio/ReverbConvolver.cpp
index 6777c58..a9550dc9 100644
--- a/third_party/WebKit/Source/platform/audio/ReverbConvolver.cpp
+++ b/third_party/WebKit/Source/platform/audio/ReverbConvolver.cpp
@@ -27,8 +27,6 @@
  */
 
 #include "platform/audio/ReverbConvolver.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "platform/Task.h"
 #include "platform/audio/AudioBus.h"
 #include "platform/audio/VectorMath.h"
@@ -192,4 +190,3 @@ size_t ReverbConvolver::latencyFrames() const
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/platform/audio/ReverbConvolver.h b/third_party/WebKit/Source/platform/audio/ReverbConvolver.h
index a1aae75..c725a6c9 100644
--- a/third_party/WebKit/Source/platform/audio/ReverbConvolver.h
+++ b/third_party/WebKit/Source/platform/audio/ReverbConvolver.h
@@ -40,8 +40,6 @@
 #include "wtf/RefCounted.h"
 #include "wtf/Vector.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class AudioChannel;
@@ -89,6 +87,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // ReverbConvolver_h
diff --git a/third_party/WebKit/Source/platform/audio/ReverbConvolverStage.cpp b/third_party/WebKit/Source/platform/audio/ReverbConvolverStage.cpp
index 994cfe38..7bc04a3 100644
--- a/third_party/WebKit/Source/platform/audio/ReverbConvolverStage.cpp
+++ b/third_party/WebKit/Source/platform/audio/ReverbConvolverStage.cpp
@@ -27,8 +27,6 @@
  */
 
 #include "platform/audio/ReverbConvolverStage.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "platform/audio/ReverbAccumulationBuffer.h"
 #include "platform/audio/ReverbConvolver.h"
 #include "platform/audio/ReverbInputBuffer.h"
@@ -178,4 +176,3 @@ void ReverbConvolverStage::reset()
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/platform/audio/ReverbConvolverStage.h b/third_party/WebKit/Source/platform/audio/ReverbConvolverStage.h
index 9832454..8b4983a 100644
--- a/third_party/WebKit/Source/platform/audio/ReverbConvolverStage.h
+++ b/third_party/WebKit/Source/platform/audio/ReverbConvolverStage.h
@@ -35,8 +35,6 @@
 #include "wtf/Noncopyable.h"
 #include "wtf/OwnPtr.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class ReverbAccumulationBuffer;
@@ -88,6 +86,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // ReverbConvolverStage_h
diff --git a/third_party/WebKit/Source/platform/audio/ReverbInputBuffer.cpp b/third_party/WebKit/Source/platform/audio/ReverbInputBuffer.cpp
index 1a2804d..4ba25bcc 100644
--- a/third_party/WebKit/Source/platform/audio/ReverbInputBuffer.cpp
+++ b/third_party/WebKit/Source/platform/audio/ReverbInputBuffer.cpp
@@ -28,8 +28,6 @@
 
 #include "platform/audio/ReverbInputBuffer.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 ReverbInputBuffer::ReverbInputBuffer(size_t length)
@@ -84,4 +82,3 @@ void ReverbInputBuffer::reset()
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/platform/audio/ReverbInputBuffer.h b/third_party/WebKit/Source/platform/audio/ReverbInputBuffer.h
index f31cd30..932fd6c 100644
--- a/third_party/WebKit/Source/platform/audio/ReverbInputBuffer.h
+++ b/third_party/WebKit/Source/platform/audio/ReverbInputBuffer.h
@@ -34,8 +34,6 @@
 #include "wtf/Allocator.h"
 #include "wtf/Noncopyable.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 // ReverbInputBuffer is used to buffer input samples for deferred processing by the background threads.
@@ -68,6 +66,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // ReverbInputBuffer_h
diff --git a/third_party/WebKit/Source/platform/audio/SincResampler.cpp b/third_party/WebKit/Source/platform/audio/SincResampler.cpp
index f0848b7..6f32a6a 100644
--- a/third_party/WebKit/Source/platform/audio/SincResampler.cpp
+++ b/third_party/WebKit/Source/platform/audio/SincResampler.cpp
@@ -27,8 +27,6 @@
  */
 
 #include "platform/audio/SincResampler.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "platform/audio/AudioBus.h"
 #include "wtf/CPU.h"
 #include "wtf/MathExtras.h"
@@ -467,4 +465,3 @@ void SincResampler::process(AudioSourceProvider* sourceProvider, float* destinat
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/platform/audio/SincResampler.h b/third_party/WebKit/Source/platform/audio/SincResampler.h
index 33f17eb..c772fee 100644
--- a/third_party/WebKit/Source/platform/audio/SincResampler.h
+++ b/third_party/WebKit/Source/platform/audio/SincResampler.h
@@ -35,8 +35,6 @@
 #include "wtf/Allocator.h"
 #include "wtf/Noncopyable.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 // SincResampler is a high-quality sample-rate converter.
@@ -90,6 +88,4 @@ protected:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // SincResampler_h
diff --git a/third_party/WebKit/Source/platform/audio/Spatializer.cpp b/third_party/WebKit/Source/platform/audio/Spatializer.cpp
index 92ed905..ba11fbc 100644
--- a/third_party/WebKit/Source/platform/audio/Spatializer.cpp
+++ b/third_party/WebKit/Source/platform/audio/Spatializer.cpp
@@ -3,8 +3,6 @@
 // found in the LICENSE file.
 
 #include "platform/audio/Spatializer.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "platform/audio/StereoPanner.h"
 
 namespace blink {
@@ -26,4 +24,3 @@ Spatializer::~Spatializer()
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/platform/audio/Spatializer.h b/third_party/WebKit/Source/platform/audio/Spatializer.h
index 4618c02..9da000b 100644
--- a/third_party/WebKit/Source/platform/audio/Spatializer.h
+++ b/third_party/WebKit/Source/platform/audio/Spatializer.h
@@ -10,8 +10,6 @@
 #include "wtf/Noncopyable.h"
 #include "wtf/PassOwnPtr.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class AudioBus;
@@ -49,6 +47,4 @@ protected:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // Spatializer_h
diff --git a/third_party/WebKit/Source/platform/audio/StereoPanner.cpp b/third_party/WebKit/Source/platform/audio/StereoPanner.cpp
index 9d6ff30..bc636e2 100644
--- a/third_party/WebKit/Source/platform/audio/StereoPanner.cpp
+++ b/third_party/WebKit/Source/platform/audio/StereoPanner.cpp
@@ -3,8 +3,6 @@
 // found in the LICENSE file.
 
 #include "platform/audio/StereoPanner.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "platform/audio/AudioBus.h"
 #include "platform/audio/AudioUtilities.h"
 #include "wtf/MathExtras.h"
@@ -171,4 +169,3 @@ void StereoPanner::panToTargetValue(const AudioBus* inputBus, AudioBus* outputBu
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/platform/audio/StereoPanner.h b/third_party/WebKit/Source/platform/audio/StereoPanner.h
index 73cb0b4..14b9cae 100644
--- a/third_party/WebKit/Source/platform/audio/StereoPanner.h
+++ b/third_party/WebKit/Source/platform/audio/StereoPanner.h
@@ -7,8 +7,6 @@
 
 #include "platform/audio/Spatializer.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 // Common type of stereo panner as found in normal audio mixing equipment.
@@ -35,6 +33,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // StereoPanner_h
diff --git a/third_party/WebKit/Source/platform/audio/UpSampler.cpp b/third_party/WebKit/Source/platform/audio/UpSampler.cpp
index beda6d1..e3ec2de 100644
--- a/third_party/WebKit/Source/platform/audio/UpSampler.cpp
+++ b/third_party/WebKit/Source/platform/audio/UpSampler.cpp
@@ -29,8 +29,6 @@
  */
 
 #include "platform/audio/UpSampler.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "wtf/MathExtras.h"
 
 namespace blink {
@@ -128,4 +126,3 @@ size_t UpSampler::latencyFrames() const
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/platform/audio/UpSampler.h b/third_party/WebKit/Source/platform/audio/UpSampler.h
index 62c4719..88285e3 100644
--- a/third_party/WebKit/Source/platform/audio/UpSampler.h
+++ b/third_party/WebKit/Source/platform/audio/UpSampler.h
@@ -36,8 +36,6 @@
 #include "wtf/Allocator.h"
 #include "wtf/Noncopyable.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 // UpSampler up-samples the source stream by a factor of 2x.
@@ -79,6 +77,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // UpSampler_h
diff --git a/third_party/WebKit/Source/platform/audio/VectorMath.cpp b/third_party/WebKit/Source/platform/audio/VectorMath.cpp
index 6c86149..2474d0e 100644
--- a/third_party/WebKit/Source/platform/audio/VectorMath.cpp
+++ b/third_party/WebKit/Source/platform/audio/VectorMath.cpp
@@ -23,8 +23,6 @@
  */
 
 #include "platform/audio/VectorMath.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "wtf/Assertions.h"
 #include "wtf/CPU.h"
 #include "wtf/MathExtras.h"
@@ -686,4 +684,3 @@ void vclip(const float* sourceP, int sourceStride, const float* lowThresholdP, c
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/platform/audio/VectorMath.h b/third_party/WebKit/Source/platform/audio/VectorMath.h
index 265222f..467ef75 100644
--- a/third_party/WebKit/Source/platform/audio/VectorMath.h
+++ b/third_party/WebKit/Source/platform/audio/VectorMath.h
@@ -29,8 +29,6 @@
 #include "wtf/build_config.h"
 #include <cstddef>
 
-#if ENABLE(WEB_AUDIO)
-
 // Defines the interface for several vector math functions whose implementation will ideally be optimized.
 
 namespace blink {
@@ -60,6 +58,4 @@ PLATFORM_EXPORT void vclip(const float* sourceP, int sourceStride, const float*
 } // namespace VectorMath
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // VectorMath_h
diff --git a/third_party/WebKit/Source/platform/audio/ZeroPole.cpp b/third_party/WebKit/Source/platform/audio/ZeroPole.cpp
index 9f15ba3..89ee399 100644
--- a/third_party/WebKit/Source/platform/audio/ZeroPole.cpp
+++ b/third_party/WebKit/Source/platform/audio/ZeroPole.cpp
@@ -27,8 +27,6 @@
  */
 
 #include "platform/audio/ZeroPole.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "platform/audio/DenormalDisabler.h"
 
 namespace blink {
@@ -68,4 +66,3 @@ void ZeroPole::process(const float *source, float *destination, unsigned framesT
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/platform/audio/ZeroPole.h b/third_party/WebKit/Source/platform/audio/ZeroPole.h
index 3d138f6..e7d5c9d 100644
--- a/third_party/WebKit/Source/platform/audio/ZeroPole.h
+++ b/third_party/WebKit/Source/platform/audio/ZeroPole.h
@@ -33,8 +33,6 @@
 #include "wtf/Allocator.h"
 #include "wtf/build_config.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 // ZeroPole is a simple filter with one zero and one pole.
@@ -70,6 +68,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // ZeroPole_h
diff --git a/third_party/WebKit/Source/platform/audio/android/FFTFrameOpenMAXDLAndroid.cpp b/third_party/WebKit/Source/platform/audio/android/FFTFrameOpenMAXDLAndroid.cpp
index 6749e04d..0b3c744 100644
--- a/third_party/WebKit/Source/platform/audio/android/FFTFrameOpenMAXDLAndroid.cpp
+++ b/third_party/WebKit/Source/platform/audio/android/FFTFrameOpenMAXDLAndroid.cpp
@@ -24,8 +24,6 @@
 
 #include "wtf/build_config.h"
 
-#if ENABLE(WEB_AUDIO)
-
 #if OS(ANDROID) && USE(WEBAUDIO_OPENMAX_DL_FFT)
 
 #include "platform/audio/FFTFrame.h"
@@ -174,4 +172,3 @@ OMXFFTSpec_R_F32* FFTFrame::contextForSize(unsigned log2FFTSize)
 
 #endif // #if OS(ANDROID) && !USE(WEBAUDIO_OPENMAX_DL_FFT)
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/platform/audio/ffmpeg/FFTFrameFFMPEG.cpp b/third_party/WebKit/Source/platform/audio/ffmpeg/FFTFrameFFMPEG.cpp
index 9fbf6a7..591244c 100644
--- a/third_party/WebKit/Source/platform/audio/ffmpeg/FFTFrameFFMPEG.cpp
+++ b/third_party/WebKit/Source/platform/audio/ffmpeg/FFTFrameFFMPEG.cpp
@@ -28,8 +28,6 @@
 
 #include "wtf/build_config.h"
 
-#if ENABLE(WEB_AUDIO)
-
 #if USE(WEBAUDIO_FFMPEG)
 
 #include "platform/audio/FFTFrame.h"
@@ -179,4 +177,3 @@ RDFTContext* FFTFrame::contextForSize(unsigned fftSize, int trans)
 
 #endif // USE(WEBAUDIO_FFMPEG)
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/platform/audio/ipp/FFTFrameIPP.cpp b/third_party/WebKit/Source/platform/audio/ipp/FFTFrameIPP.cpp
index fd3191d..5998d80 100644
--- a/third_party/WebKit/Source/platform/audio/ipp/FFTFrameIPP.cpp
+++ b/third_party/WebKit/Source/platform/audio/ipp/FFTFrameIPP.cpp
@@ -29,8 +29,6 @@
 
 #include "wtf/build_config.h"
 
-#if ENABLE(WEB_AUDIO)
-
 #if USE(WEBAUDIO_IPP)
 
 #include "platform/audio/FFTFrame.h"
@@ -140,4 +138,3 @@ float* FFTFrame::getUpToDateComplexData()
 
 #endif // USE(WEBAUDIO_IPP)
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/platform/audio/mac/FFTFrameMac.cpp b/third_party/WebKit/Source/platform/audio/mac/FFTFrameMac.cpp
index 744d4b7..328c303 100644
--- a/third_party/WebKit/Source/platform/audio/mac/FFTFrameMac.cpp
+++ b/third_party/WebKit/Source/platform/audio/mac/FFTFrameMac.cpp
@@ -30,8 +30,6 @@
 
 #include "wtf/build_config.h"
 
-#if ENABLE(WEB_AUDIO)
-
 #if OS(MACOSX)
 
 #include "platform/audio/FFTFrame.h"
@@ -157,4 +155,3 @@ void FFTFrame::cleanup()
 
 #endif // #if OS(MACOSX)
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/platform/exported/WebAudioBus.cpp b/third_party/WebKit/Source/platform/exported/WebAudioBus.cpp
index 7ba8c47..99176635 100644
--- a/third_party/WebKit/Source/platform/exported/WebAudioBus.cpp
+++ b/third_party/WebKit/Source/platform/exported/WebAudioBus.cpp
@@ -26,17 +26,7 @@
 
 #include "wtf/build_config.h"
 
-#if ENABLE(WEB_AUDIO)
 #include "platform/audio/AudioBus.h"
-#else
-#include "wtf/ThreadSafeRefCounted.h"
-
-namespace blink {
-class AudioBus : public ThreadSafeRefCounted<AudioBus> {
-};
-} // namespace blink
-#endif
-
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefPtr.h"
 
@@ -47,7 +37,6 @@ class WebAudioBusPrivate : public AudioBus {
 
 void WebAudioBus::initialize(unsigned numberOfChannels, size_t length, double sampleRate)
 {
-#if ENABLE(WEB_AUDIO)
     RefPtr<AudioBus> audioBus = AudioBus::create(numberOfChannels, length);
     audioBus->setSampleRate(sampleRate);
 
@@ -56,95 +45,59 @@ void WebAudioBus::initialize(unsigned numberOfChannels, size_t length, double sa
 
     audioBus->ref();
     m_private = static_cast<WebAudioBusPrivate*>(audioBus.get());
-#else
-    ASSERT_NOT_REACHED();
-#endif
 }
 
 void WebAudioBus::resizeSmaller(size_t newLength)
 {
-#if ENABLE(WEB_AUDIO)
     ASSERT(m_private);
     if (m_private) {
         ASSERT(newLength <= length());
         m_private->resizeSmaller(newLength);
     }
-#else
-    ASSERT_NOT_REACHED();
-#endif
 }
 
 void WebAudioBus::reset()
 {
-#if ENABLE(WEB_AUDIO)
     if (m_private) {
         (static_cast<AudioBus*>(m_private))->deref();
         m_private = 0;
     }
-#else
-    ASSERT_NOT_REACHED();
-#endif
 }
 
 unsigned WebAudioBus::numberOfChannels() const
 {
-#if ENABLE(WEB_AUDIO)
     if (!m_private)
         return 0;
     return m_private->numberOfChannels();
-#else
-    ASSERT_NOT_REACHED();
-    return 0;
-#endif
 }
 
 size_t WebAudioBus::length() const
 {
-#if ENABLE(WEB_AUDIO)
     if (!m_private)
         return 0;
     return m_private->length();
-#else
-    ASSERT_NOT_REACHED();
-    return 0;
-#endif
 }
 
 double WebAudioBus::sampleRate() const
 {
-#if ENABLE(WEB_AUDIO)
     if (!m_private)
         return 0;
     return m_private->sampleRate();
-#else
-    ASSERT_NOT_REACHED();
-    return 0;
-#endif
 }
 
 float* WebAudioBus::channelData(unsigned channelIndex)
 {
-#if ENABLE(WEB_AUDIO)
     if (!m_private)
         return 0;
     ASSERT(channelIndex < numberOfChannels());
     return m_private->channel(channelIndex)->mutableData();
-#else
-    ASSERT_NOT_REACHED();
-    return 0;
-#endif
 }
 
 PassRefPtr<AudioBus> WebAudioBus::release()
 {
-#if ENABLE(WEB_AUDIO)
     RefPtr<AudioBus> audioBus(adoptRef(static_cast<AudioBus*>(m_private)));
     m_private = 0;
     return audioBus;
-#else
-    ASSERT_NOT_REACHED();
-    return nullptr;
-#endif
 }
 
 } // namespace blink
diff --git a/third_party/WebKit/Source/platform/exported/WebMediaStreamSource.cpp b/third_party/WebKit/Source/platform/exported/WebMediaStreamSource.cpp
index 0c74cd3..d3a0421 100644
--- a/third_party/WebKit/Source/platform/exported/WebMediaStreamSource.cpp
+++ b/third_party/WebKit/Source/platform/exported/WebMediaStreamSource.cpp
@@ -196,7 +196,6 @@ void ConsumerWrapper::setFormat(size_t numberOfChannels, float sampleRate)
 
 void ConsumerWrapper::consumeAudio(AudioBus* bus, size_t numberOfFrames)
 {
-#if ENABLE(WEB_AUDIO)
     if (!bus)
         return;
 
@@ -207,7 +206,6 @@ void ConsumerWrapper::consumeAudio(AudioBus* bus, size_t numberOfFrames)
         busVector[i] = bus->channel(i)->data();
 
     m_consumer->consumeAudio(busVector, numberOfFrames);
-#endif
 }
 
 void WebMediaStreamSource::addAudioConsumer(WebAudioDestinationConsumer* consumer)
diff --git a/third_party/WebKit/Source/platform/exported/WebMediaStreamTrack.cpp b/third_party/WebKit/Source/platform/exported/WebMediaStreamTrack.cpp
index 5156f5d..2fec966 100644
--- a/third_party/WebKit/Source/platform/exported/WebMediaStreamTrack.cpp
+++ b/third_party/WebKit/Source/platform/exported/WebMediaStreamTrack.cpp
@@ -118,11 +118,8 @@ void WebMediaStreamTrack::setExtraData(ExtraData* extraData)
 }
 
 void WebMediaStreamTrack::setSourceProvider(WebAudioSourceProvider* provider)
-{
-#if ENABLE(WEB_AUDIO)
-    ASSERT(!m_private.isNull());
+{    ASSERT(!m_private.isNull());
     m_private->setSourceProvider(provider);
-#endif // ENABLE(WEB_AUDIO)
 }
 
 void WebMediaStreamTrack::assign(const WebMediaStreamTrack& other)
diff --git a/third_party/WebKit/Source/platform/mediastream/MediaStreamCenter.cpp b/third_party/WebKit/Source/platform/mediastream/MediaStreamCenter.cpp
index 910de87..0515d2a 100644
--- a/third_party/WebKit/Source/platform/mediastream/MediaStreamCenter.cpp
+++ b/third_party/WebKit/Source/platform/mediastream/MediaStreamCenter.cpp
@@ -125,10 +125,8 @@ void MediaStreamCenter::didCreateMediaStreamTrack(MediaStreamComponent* track)
 PassOwnPtr<AudioSourceProvider> MediaStreamCenter::createWebAudioSourceFromMediaStreamTrack(MediaStreamComponent* track)
 {
     ASSERT_UNUSED(track, track);
-#if ENABLE(WEB_AUDIO)
     if (m_private)
         return MediaStreamWebAudioSource::create(adoptPtr(m_private->createWebAudioSourceFromMediaStreamTrack(track)));
-#endif
 
     return nullptr;
 }
diff --git a/third_party/WebKit/Source/platform/mediastream/MediaStreamComponent.cpp b/third_party/WebKit/Source/platform/mediastream/MediaStreamComponent.cpp
index 23f8e5f..a05a6ab 100644
--- a/third_party/WebKit/Source/platform/mediastream/MediaStreamComponent.cpp
+++ b/third_party/WebKit/Source/platform/mediastream/MediaStreamComponent.cpp
@@ -63,7 +63,6 @@ void MediaStreamComponent::dispose()
     m_extraData.clear();
 }
 
-#if ENABLE(WEB_AUDIO)
 void MediaStreamComponent::AudioSourceProviderImpl::wrap(WebAudioSourceProvider* provider)
 {
     MutexLocker locker(m_provideInputLock);
@@ -90,7 +89,6 @@ void MediaStreamComponent::AudioSourceProviderImpl::provideInput(AudioBus* bus,
 
     m_webAudioSourceProvider->provideInput(webAudioData, framesToProcess);
 }
-#endif // #if ENABLE(WEB_AUDIO)
 
 DEFINE_TRACE(MediaStreamComponent)
 {
diff --git a/third_party/WebKit/Source/platform/mediastream/MediaStreamComponent.h b/third_party/WebKit/Source/platform/mediastream/MediaStreamComponent.h
index a07dff0..8a7824c 100644
--- a/third_party/WebKit/Source/platform/mediastream/MediaStreamComponent.h
+++ b/third_party/WebKit/Source/platform/mediastream/MediaStreamComponent.h
@@ -68,11 +68,8 @@ public:
     void setEnabled(bool enabled) { m_enabled = enabled; }
     bool muted() const { return m_muted; }
     void setMuted(bool muted) { m_muted = muted; }
-
-#if ENABLE(WEB_AUDIO)
     AudioSourceProvider* audioSourceProvider() { return &m_sourceProvider; }
     void setSourceProvider(WebAudioSourceProvider* provider) { m_sourceProvider.wrap(provider); }
-#endif // ENABLE(WEB_AUDIO)
 
     ExtraData* extraData() const { return m_extraData.get(); }
     void setExtraData(PassOwnPtr<ExtraData> extraData) { m_extraData = std::move(extraData); }
@@ -82,7 +79,6 @@ public:
 private:
     MediaStreamComponent(const String& id, MediaStreamSource*);
 
-#if ENABLE(WEB_AUDIO)
     // AudioSourceProviderImpl wraps a WebAudioSourceProvider::provideInput()
     // calls into chromium to get a rendered audio stream.
 
@@ -107,8 +103,6 @@ private:
     };
 
     AudioSourceProviderImpl m_sourceProvider;
-#endif // ENABLE(WEB_AUDIO)
-
     Member<MediaStreamSource> m_source;
     String m_id;
     bool m_enabled;
diff --git a/third_party/WebKit/Source/platform/mediastream/MediaStreamWebAudioSource.cpp b/third_party/WebKit/Source/platform/mediastream/MediaStreamWebAudioSource.cpp
index 156a4a3..47bd137 100644
--- a/third_party/WebKit/Source/platform/mediastream/MediaStreamWebAudioSource.cpp
+++ b/third_party/WebKit/Source/platform/mediastream/MediaStreamWebAudioSource.cpp
@@ -29,8 +29,6 @@
  */
 
 #include "platform/mediastream/MediaStreamWebAudioSource.h"
-
-#if ENABLE(WEB_AUDIO)
 #include "platform/audio/AudioBus.h"
 #include "public/platform/WebAudioSourceProvider.h"
 
@@ -67,4 +65,3 @@ void MediaStreamWebAudioSource::provideInput(AudioBus* bus, size_t framesToProce
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/platform/mediastream/MediaStreamWebAudioSource.h b/third_party/WebKit/Source/platform/mediastream/MediaStreamWebAudioSource.h
index 9383fc8..a2d4260 100644
--- a/third_party/WebKit/Source/platform/mediastream/MediaStreamWebAudioSource.h
+++ b/third_party/WebKit/Source/platform/mediastream/MediaStreamWebAudioSource.h
@@ -38,8 +38,6 @@
 #include "wtf/ThreadingPrimitives.h"
 #include "wtf/build_config.h"
 
-#if ENABLE(WEB_AUDIO)
-
 namespace blink {
 
 class WebAudioSourceProvider;
@@ -62,6 +60,4 @@ private:
 
 } // namespace blink
 
-#endif // ENABLE(WEB_AUDIO)
-
 #endif // MediaStreamWebAudioSource_h
author	haraken <haraken@chromium.org>	2016-01-11 02:19:16 -0800
committer	Commit bot <commit-bot@chromium.org>	2016-01-11 10:21:33 +0000
commit	e7fc592f19c6ffde1296ff01482013a0dd68a977 (patch)
tree	28e287dec98b03930acd720c728c11ac4cd47581
parent	7fdccee949335fe31c65e24e47c4bd6da69b99d2 (diff)
download	chromium_src-e7fc592f19c6ffde1296ff01482013a0dd68a977.zip chromium_src-e7fc592f19c6ffde1296ff01482013a0dd68a977.tar.gz chromium_src-e7fc592f19c6ffde1296ff01482013a0dd68a977.tar.bz2