This patch removes the need to add MAYBE lines for nearly every test that goes into find_request_ma…

content/browser/find_request_manager_browsertest.cc

 // Copyright 2016 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 "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/content_browser_test.h"
@@ skipping 259 matching lines @@
 INSTANTIATE_TEST_CASE_P(
     FindRequestManagerTests, FindRequestManagerTest, testing::Values(false));
 #else
 INSTANTIATE_TEST_CASE_P(
     FindRequestManagerTests, FindRequestManagerTest, testing::Bool());
 #endif
 
 // TODO(crbug.com/615291): These tests sometimes fail on the
 // linux_android_rel_ng trybot.
 #if defined(OS_ANDROID) && defined(NDEBUG)
-#define MAYBE_Basic DISABLED_Basic
-#define MAYBE_CharacterByCharacter DISABLED_CharacterByCharacter
-#define MAYBE_RapidFire DISABLED_RapidFire
-#define MAYBE_RemoveFrame DISABLED_RemoveFrame
-#define MAYBE_HiddenFrame DISABLED_HiddenFrame
-#define MAYBE_FindMatchRects DISABLED_FindMatchRects
-#define MAYBE_ActivateNearestFindMatch DISABLED_ActivateNearestFindMatch
+#define MAYBE(x) DISABLED_##x
 #else
-#define MAYBE_Basic Basic
-#define MAYBE_CharacterByCharacter CharacterByCharacter
-#define MAYBE_RapidFire RapidFire
-#define MAYBE_RemoveFrame RemoveFrame
-#define MAYBE_HiddenFrame HiddenFrame
-#define MAYBE_FindMatchRects FindMatchRects
-#define MAYBE_ActivateNearestFindMatch ActivateNearestFindMatch
+#define MAYBE(x) x
 #endif
 
 
 // Tests basic find-in-page functionality (such as searching forward and
 // backward) and check for correct results at each step.
-IN_PROC_BROWSER_TEST_P(FindRequestManagerTest, MAYBE_Basic) {
+IN_PROC_BROWSER_TEST_P(FindRequestManagerTest, MAYBE(Basic)) {
   LoadAndWait("/find_in_page.html");
   if (GetParam())
     MakeChildFrameCrossProcess();
 
   blink::WebFindOptions options;
   Find("result", options);
   WaitForFinalReply();
 
   FindResults results = delegate()->GetFindResults();
   EXPECT_EQ(last_request_id(), results.request_id);
@@ skipping 18 matching lines @@
 
     results = delegate()->GetFindResults();
     EXPECT_EQ(last_request_id(), results.request_id);
     EXPECT_EQ(19, results.number_of_matches);
     EXPECT_EQ(i, results.active_match_ordinal);
   }
 }
 
 // Tests searching for a word character-by-character, as would typically be done
 // by a user typing into the find bar.
-IN_PROC_BROWSER_TEST_P(FindRequestManagerTest, MAYBE_CharacterByCharacter) {
+IN_PROC_BROWSER_TEST_P(FindRequestManagerTest, MAYBE(CharacterByCharacter)) {
   LoadAndWait("/find_in_page.html");
   if (GetParam())
     MakeChildFrameCrossProcess();
 
   blink::WebFindOptions default_options;
   Find("r", default_options);
   Find("re", default_options);
   Find("res", default_options);
   Find("resu", default_options);
   Find("resul", default_options);
   Find("result", default_options);
   WaitForFinalReply();
 
   FindResults results = delegate()->GetFindResults();
   EXPECT_EQ(last_request_id(), results.request_id);
   EXPECT_EQ(19, results.number_of_matches);
   EXPECT_EQ(1, results.active_match_ordinal);
 }
 
 // Tests sending a large number of find requests subsequently.
-IN_PROC_BROWSER_TEST_P(FindRequestManagerTest, MAYBE_RapidFire) {
+IN_PROC_BROWSER_TEST_P(FindRequestManagerTest, MAYBE(RapidFire)) {
   LoadAndWait("/find_in_page.html");
   if (GetParam())
     MakeChildFrameCrossProcess();
 
   blink::WebFindOptions options;
   Find("result", options);
 
   options.findNext = true;
   for (int i = 2; i <= 1000; ++i)
     Find("result", options);
   WaitForFinalReply();
 
   FindResults results = delegate()->GetFindResults();
   EXPECT_EQ(last_request_id(), results.request_id);
   EXPECT_EQ(19, results.number_of_matches);
   EXPECT_EQ(last_request_id() % results.number_of_matches,
             results.active_match_ordinal);
 }
 
 // Tests removing a frame during a find session.
-IN_PROC_BROWSER_TEST_P(FindRequestManagerTest, MAYBE_RemoveFrame) {
+IN_PROC_BROWSER_TEST_P(FindRequestManagerTest, MAYBE(RemoveFrame)) {
   LoadMultiFramePage(2 /* height */, GetParam() /* cross_process */);
 
   blink::WebFindOptions options;
   Find("result", options);
   options.findNext = true;
   options.forward = false;
   Find("result", options);
   Find("result", options);
   Find("result", options);
   Find("result", options);
@@ skipping 16 matching lines @@
   results = delegate()->GetFindResults();
   EXPECT_EQ(last_request_id(), results.request_id);
   EXPECT_EQ(12, results.number_of_matches);
   EXPECT_EQ(8, results.active_match_ordinal);
 
   // TODO(paulemeyer): Once adding frames mid-session is handled, test that too.
 }
 
 // Tests Searching in a hidden frame. Matches in the hidden frame should be
 // ignored.
-IN_PROC_BROWSER_TEST_F(FindRequestManagerTest, MAYBE_HiddenFrame) {
+IN_PROC_BROWSER_TEST_F(FindRequestManagerTest, MAYBE(HiddenFrame)) {
   LoadAndWait("/find_in_hidden_frame.html");
 
   blink::WebFindOptions default_options;
   Find("hello", default_options);
   WaitForFinalReply();
   FindResults results = delegate()->GetFindResults();
 
   EXPECT_EQ(last_request_id(), results.request_id);
   EXPECT_EQ(1, results.number_of_matches);
   EXPECT_EQ(1, results.active_match_ordinal);
 }
 
 #if defined(OS_ANDROID)
 // Tests requesting find match rects.
-IN_PROC_BROWSER_TEST_F(FindRequestManagerTest, MAYBE_FindMatchRects) {
+IN_PROC_BROWSER_TEST_F(FindRequestManagerTest, MAYBE(FindMatchRects)) {
   LoadAndWait("/find_in_page.html");
 
   blink::WebFindOptions default_options;
   Find("result", default_options);
   WaitForFinalReply();
   EXPECT_EQ(19, delegate()->GetFindResults().number_of_matches);
 
   // Request the find match rects.
   contents()->RequestFindMatchRects(-1);
   delegate()->WaitForMatchRects();
@@ skipping 60 matching lines @@
   // Result 16 should be below result 15.
   EXPECT_GT(rects[15].y(), rects[14].y());
 
   // Result 18 should be normalized with respect to the position:relative div,
   // and not it's immediate containing div. Consequently, result 18 should be
   // above result 17.
   EXPECT_GT(rects[17].y(), rects[18].y());
 }
 
 // Tests activating the find match nearest to a given point.
-IN_PROC_BROWSER_TEST_F(FindRequestManagerTest, MAYBE_ActivateNearestFindMatch) {
+IN_PROC_BROWSER_TEST_F(FindRequestManagerTest,
+                       MAYBE(ActivateNearestFindMatch)) {
   LoadAndWait("/find_in_page.html");
 
   blink::WebFindOptions default_options;
   Find("result", default_options);
   WaitForFinalReply();
   EXPECT_EQ(19, delegate()->GetFindResults().number_of_matches);
 
   // Get the find match rects.
   contents()->RequestFindMatchRects(-1);
   delegate()->WaitForMatchRects();
   const std::vector<gfx::RectF>& rects = delegate()->find_match_rects();
 
   // Activate matches via points inside each of the find match rects, in an
   // arbitrary order. Check that the correct match becomes active after each
   // activation.
   int order[19] =
       {11, 13, 2, 0, 16, 5, 7, 10, 6, 1, 15, 14, 9, 17, 18, 3, 8, 12, 4};
   for (int i = 0; i < 19; ++i) {
     contents()->ActivateNearestFindResult(
         rects[order[i]].CenterPoint().x(), rects[order[i]].CenterPoint().y());
     delegate()->WaitForNextReply();
     EXPECT_EQ(order[i] + 1, delegate()->GetFindResults().active_match_ordinal);
   }
 }
 #endif  // defined(OS_ANDROID)
 
 }  // namespace content