Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(502)

Side by Side Diff: content/browser/find_request_manager_browsertest.cc

Issue 2449733003: Disable FindRequestManager tests on android debug also. (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/strings/utf_string_conversions.h" 6 #include "base/strings/utf_string_conversions.h"
7 #include "content/browser/web_contents/web_contents_impl.h" 7 #include "content/browser/web_contents/web_contents_impl.h"
8 #include "content/public/browser/notification_types.h" 8 #include "content/public/browser/notification_types.h"
9 #include "content/public/common/content_switches.h" 9 #include "content/public/common/content_switches.h"
10 #include "content/public/test/browser_test_utils.h" 10 #include "content/public/test/browser_test_utils.h"
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 // Frames are made cross-process when the test param is set to 349 // Frames are made cross-process when the test param is set to
350 // true. Cross-process frames are not used on android. 350 // true. Cross-process frames are not used on android.
351 #if defined(OS_ANDROID) 351 #if defined(OS_ANDROID)
352 INSTANTIATE_TEST_CASE_P( 352 INSTANTIATE_TEST_CASE_P(
353 FindRequestManagerTests, FindRequestManagerTest, testing::Values(false)); 353 FindRequestManagerTests, FindRequestManagerTest, testing::Values(false));
354 #else 354 #else
355 INSTANTIATE_TEST_CASE_P( 355 INSTANTIATE_TEST_CASE_P(
356 FindRequestManagerTests, FindRequestManagerTest, testing::Bool()); 356 FindRequestManagerTests, FindRequestManagerTest, testing::Bool());
357 #endif 357 #endif
358 358
359 // TODO(crbug.com/615291): These tests sometimes fail on the 359 // TODO(crbug.com/615291): These tests frequently fail on Android.
360 // linux_android_rel_ng trybot. 360 #if defined(OS_ANDROID)
361 #if defined(OS_ANDROID) && defined(NDEBUG)
362 #define MAYBE(x) DISABLED_##x 361 #define MAYBE(x) DISABLED_##x
363 #else 362 #else
364 #define MAYBE(x) x 363 #define MAYBE(x) x
365 #endif 364 #endif
366 365
367 366
368 // Tests basic find-in-page functionality (such as searching forward and 367 // Tests basic find-in-page functionality (such as searching forward and
369 // backward) and check for correct results at each step. 368 // backward) and check for correct results at each step.
370 IN_PROC_BROWSER_TEST_P(FindRequestManagerTest, MAYBE(Basic)) { 369 IN_PROC_BROWSER_TEST_P(FindRequestManagerTest, MAYBE(Basic)) {
371 LoadAndWait("/find_in_page.html"); 370 LoadAndWait("/find_in_page.html");
(...skipping 432 matching lines...) Expand 10 before | Expand all | Expand 10 after
804 delegate()->MarkNextReply(); 803 delegate()->MarkNextReply();
805 contents()->ActivateNearestFindResult( 804 contents()->ActivateNearestFindResult(
806 rects[order[i]].CenterPoint().x(), rects[order[i]].CenterPoint().y()); 805 rects[order[i]].CenterPoint().x(), rects[order[i]].CenterPoint().y());
807 delegate()->WaitForNextReply(); 806 delegate()->WaitForNextReply();
808 EXPECT_EQ(order[i] + 1, delegate()->GetFindResults().active_match_ordinal); 807 EXPECT_EQ(order[i] + 1, delegate()->GetFindResults().active_match_ordinal);
809 } 808 }
810 } 809 }
811 #endif // defined(OS_ANDROID) 810 #endif // defined(OS_ANDROID)
812 811
813 } // namespace content 812 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698