Disabling flaky WebRtcGetUserMediaBrowserTest.TwoGet...1080pSecondVga.

content/browser/webrtc/webrtc_getusermedia_browsertest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stddef.h>
 
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/strings/stringprintf.h"
@@ skipping 500 matching lines @@
   std::string constraints1 =
       "{video: {mandatory: {maxWidth:1280 , minWidth:1280 , maxHeight: 720,\
       minHeight: 720}}}";
   std::string constraints2 =
       "{video: {mandatory: {maxWidth:640 , maxHeight: 480}}}";
   std::string expected_result = "w=1280:h=720-w=640:h=480";
   RunTwoGetTwoGetUserMediaWithDifferentContraints(constraints1, constraints2,
                                                   expected_result);
 }
 
-#if defined(OS_WIN)
-// Timing out on Winodws 7 bot: http://crbug.com/443294
-#define MAYBE_TwoGetUserMediaWithFirst1080pSecondVga\
-    DISABLED_TwoGetUserMediaWithFirst1080pSecondVga
-#else
-#define MAYBE_TwoGetUserMediaWithFirst1080pSecondVga\
-    TwoGetUserMediaWithFirst1080pSecondVga
-#endif
-
+// Timing out on Windows 7 bot: http://crbug.com/443294
+// Flaky: http://crbug.com/660656; possible the test is too perf sensitive.
 IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
-                       MAYBE_TwoGetUserMediaWithFirst1080pSecondVga) {
+                       DISABLED_TwoGetUserMediaWithFirst1080pSecondVga) {
   std::string constraints1 =
       "{video: {mandatory: {maxWidth:1920 , minWidth:1920 , maxHeight: 1080,\
       minHeight: 1080}}}";
   std::string constraints2 =
       "{video: {mandatory: {maxWidth:640 , maxHeight: 480}}}";
   std::string expected_result = "w=1920:h=1080-w=640:h=480";
   RunTwoGetTwoGetUserMediaWithDifferentContraints(constraints1, constraints2,
                                                   expected_result);
 }
 
@@ skipping 222 matching lines @@
       base::Bind(&VerifyDisableLocalEcho, true));
   call = GenerateGetUserMediaWithDisableLocalEcho(
       "getUserMediaAndExpectSuccess", "true");
   ExecuteJavascriptAndWaitForOk(call);
 
   manager->SetGenerateStreamCallbackForTesting(
       MediaStreamManager::GenerateStreamTestCallback());
 }
 
 }  // namespace content