Re-enable WebRTC audio quality tests in Windows

chrome/browser/media/webrtc_audio_quality_browsertest.cc

Index: chrome/browser/media/webrtc_audio_quality_browsertest.cc
diff --git a/chrome/browser/media/webrtc_audio_quality_browsertest.cc b/chrome/browser/media/webrtc_audio_quality_browsertest.cc
index 2e988f656a002d61f32561479d72b782b2aa0145..c8078564f0585f8a9424afd0410d286f7c4a37e7 100644
--- a/chrome/browser/media/webrtc_audio_quality_browsertest.cc
+++ b/chrome/browser/media/webrtc_audio_quality_browsertest.cc
@@ -61,11 +61,10 @@ const int kMaxAgcSegmentDiffMs =
   200;
 #endif
 
-#if defined(OS_LINUX) || defined(OS_MACOSX)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
 #define MAYBE_WebRtcAudioQualityBrowserTest WebRtcAudioQualityBrowserTest
 #else
 // Not implemented on Android, ChromeOS etc.
-// Disabled on win while bots are configured: http://crbug.com/625808.
 #define MAYBE_WebRtcAudioQualityBrowserTest DISABLED_WebRtcAudioQualityBrowserTest
 #endif
 
@@ -804,9 +803,18 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcAudioQualityBrowserTest,
       kReferenceFile, kAudioOnlyCallConstraints, "_with_agc"));
 }
 
+// The test is failing on the Win7 bot.
+// http://crbug.com/625808#c23
+#if defined(OS_WIN)
+#define MAYBE_MANUAL_TestAutoGainIsOffWithAudioProcessingOff\
+    DISABLED_TestAutoGainIsOffWithAudioProcessingOff
+#else
+#define MAYBE_MANUAL_TestAutoGainIsOffWithAudioProcessingOff\
+    MANUAL_TestAutoGainIsOffWithAudioProcessingOff
+#endif
 // Since the AGC is off here there should be no gain at all.
 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcAudioQualityBrowserTest,
-                       MANUAL_TestAutoGainIsOffWithAudioProcessingOff) {
+                       MAYBE_MANUAL_TestAutoGainIsOffWithAudioProcessingOff) {
   const char* kAudioCallWithoutAudioProcessing =
       "{audio: { mandatory: { echoCancellation: false } } }";
   ASSERT_NO_FATAL_FAILURE(TestAutoGainControl(