diff --git a/webrtc/modules/audio_processing/aec/aec_core_internal.h b/webrtc/modules/audio_processing/aec/aec_core_internal.h
index d11df931f..a8f0c0ce9 100644
--- a/webrtc/modules/audio_processing/aec/aec_core_internal.h
+++ b/webrtc/modules/audio_processing/aec/aec_core_internal.h
@@ -24,20 +24,14 @@ enum {
 };
 static const int kNormalNumPartitions = 12;
 
-// Delay estimator constants, used for logging.
-enum {
-  kMaxDelayBlocks = 60
-};
+// Delay estimator constants, used for logging and delay compensation if
+// if reported delays are disabled.
 enum {
   kLookaheadBlocks = 15
 };
 enum {
-#ifdef WEBRTC_ANDROID
   // 500 ms for 16 kHz which is equivalent with the limit of reported delays.
   kHistorySizeBlocks = 125
-#else
-  kHistorySizeBlocks = kMaxDelayBlocks + kLookaheadBlocks
-#endif
 };
 
 // Extended filter adaptation parameters.
diff --git a/webrtc/modules/audio_processing/test/audio_processing_unittest.cc b/webrtc/modules/audio_processing/test/audio_processing_unittest.cc
index 78e79a5eb..2c916f1d6 100644
--- a/webrtc/modules/audio_processing/test/audio_processing_unittest.cc
+++ b/webrtc/modules/audio_processing/test/audio_processing_unittest.cc
@@ -826,6 +826,7 @@ TEST_F(ApmTest, EchoCancellation) {
 }
 
 TEST_F(ApmTest, DISABLED_EchoCancellationReportsCorrectDelays) {
+  // TODO(bjornv): Fix this test to work with DA-AEC.
   // Enable AEC only.
   EXPECT_EQ(apm_->kNoError,
             apm_->echo_cancellation()->enable_drift_compensation(false));