Disable flaky CanMakePayment_Supported and CanMakePayment_NotSupported_Incognito (PaymentRequestCan…

chrome/browser/ui/views/payments/payment_request_can_make_payment_browsertest.cc

 // Copyright 2017 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 <vector>
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/views/payments/payment_request_browsertest_base.h"
 #include "components/autofill/core/browser/autofill_test_utils.h"
@@ skipping 11 matching lines @@
 
   void CallCanMakePayment() {
     ASSERT_TRUE(content::ExecuteScript(GetActiveWebContents(), "buy();"));
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PaymentRequestCanMakePaymentQueryTest);
 };
 
 // Visa is required, and user has a visa instrument.
-// Test is flaky on ChromeOS. crbug.com/705225
-#if defined(OS_CHROMEOS)
-#define MAYBE_CanMakePayment_Supported DISABLED_CanMakePayment_Supported
-#else
-#define MAYBE_CanMakePayment_Supported CanMakePayment_Supported
-#endif
+// Test is flaky. crbug.com/705225
 IN_PROC_BROWSER_TEST_F(PaymentRequestCanMakePaymentQueryTest,
-                       MAYBE_CanMakePayment_Supported) {
+                       DISABLED_CanMakePayment_Supported) {
   const autofill::CreditCard card = autofill::test::GetCreditCard();  // Visa.
   AddCreditCard(card);
 
   CallCanMakePayment();
 
   ExpectBodyContains(std::vector<base::string16>{base::ASCIIToUTF16("true")});
 }
 
 // Visa is required, and user has a visa instrument, and user is in incognito
 // mode.
@@ skipping 15 matching lines @@
   const autofill::CreditCard card = autofill::test::GetCreditCard2();  // Amex.
   AddCreditCard(card);
 
   CallCanMakePayment();
 
   ExpectBodyContains(std::vector<base::string16>{base::ASCIIToUTF16("false")});
 }
 
 // Visa is required, and user doesn't have a visa instrument and the user is in
 // incognito mode.
-// Test is flaky on ChromeOS. crbug.com/705271
-#if defined(OS_CHROMEOS)
-#define MAYBE_CanMakePayment_NotSupported_Incognito \
-  DISABLED_CanMakePayment_NotSupported_Incognito
-#else
-#define MAYBE_CanMakePayment_NotSupported_Incognito \
-  CanMakePayment_NotSupported_Incognito
-#endif
+// Test is flaky. crbug.com/705271
 IN_PROC_BROWSER_TEST_F(PaymentRequestCanMakePaymentQueryTest,
-                       MAYBE_CanMakePayment_NotSupported_Incognito) {
+                       DISABLED_CanMakePayment_NotSupported_Incognito) {
   SetIncognitoForTesting();
 
   const autofill::CreditCard card = autofill::test::GetCreditCard2();  // Amex.
   AddCreditCard(card);
 
   CallCanMakePayment();
 
   // Returns true because the user is in incognito mode, even though it should
   // return false in a normal profile.
   ExpectBodyContains(std::vector<base::string16>{base::ASCIIToUTF16("true")});
 }
 
 }  // namespace payments