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

Side by Side Diff: chrome/browser/ui/search/instant_extended_interactive_uitest.cc

Issue 15537002: Disable flaky InstantExtendedTest.MiddleClickOnSuggestionOpensInNewTab on Mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix stupid copy and paste error Created 7 years, 7 months 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 | Annotate | Revision Log
« 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 <sstream> 5 #include <sstream>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/metrics/field_trial.h" 8 #include "base/metrics/field_trial.h"
9 #include "base/metrics/histogram_base.h" 9 #include "base/metrics/histogram_base.h"
10 #include "base/metrics/histogram_samples.h" 10 #include "base/metrics/histogram_samples.h"
(...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 chrome::NOTIFICATION_INSTANT_TAB_SUPPORT_DETERMINED, 367 chrome::NOTIFICATION_INSTANT_TAB_SUPPORT_DETERMINED,
368 content::NotificationService::AllSources()); 368 content::NotificationService::AllSources());
369 instant_tab_observer.Wait(); 369 instant_tab_observer.Wait();
370 } 370 }
371 371
372 // Hide the overlay. Now, we should be using Instant tab for suggestions. 372 // Hide the overlay. Now, we should be using Instant tab for suggestions.
373 instant()->HideOverlay(); 373 instant()->HideOverlay();
374 EXPECT_TRUE(instant()->UseTabForSuggestions()); 374 EXPECT_TRUE(instant()->UseTabForSuggestions());
375 } 375 }
376 376
377 // Flaky on Mac Tests bot. crbug.com/242415
378 #if defined(OS_MACOSX)
379 #define MAYBE_MiddleClickOnSuggestionOpensInNewTab DISABLED_MiddleClickOnSuggest ionOpensInNewTab
380 #else
381 #define MAYBE_MiddleClickOnSuggestionOpensInNewTab MiddleClickOnSuggestionOpensI nNewTab
382 #endif
383
377 // Test that middle clicking on a suggestion opens the result in a new tab. 384 // Test that middle clicking on a suggestion opens the result in a new tab.
378 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, 385 IN_PROC_BROWSER_TEST_F(InstantExtendedTest,
379 MiddleClickOnSuggestionOpensInNewTab) { 386 MAYBE_MiddleClickOnSuggestionOpensInNewTab) {
380 ASSERT_NO_FATAL_FAILURE(SetupInstant(browser())); 387 ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
381 FocusOmniboxAndWaitForInstantOverlayAndNTPSupport(); 388 FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
382 EXPECT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); 389 EXPECT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
383 390
384 EXPECT_EQ(1, browser()->tab_strip_model()->count()); 391 EXPECT_EQ(1, browser()->tab_strip_model()->count());
385 392
386 // Typing in the omnibox should show the overlay. 393 // Typing in the omnibox should show the overlay.
387 ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("http://www.example.com/")); 394 ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("http://www.example.com/"));
388 395
389 // Create an event listener that opens the top suggestion in a new tab. 396 // Create an event listener that opens the top suggestion in a new tab.
(...skipping 2117 matching lines...) Expand 10 before | Expand all | Expand 10 after
2507 2514
2508 // Test that if the LogDropdownShown() call records a histogram value. 2515 // Test that if the LogDropdownShown() call records a histogram value.
2509 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, LogDropdownShown) { 2516 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, LogDropdownShown) {
2510 ASSERT_NO_FATAL_FAILURE(SetupInstant(browser())); 2517 ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
2511 FocusOmniboxAndWaitForInstantOverlayAndNTPSupport(); 2518 FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
2512 int64 histogramValue = GetHistogramCount("Instant.TimeToFirstShowFromWeb"); 2519 int64 histogramValue = GetHistogramCount("Instant.TimeToFirstShowFromWeb");
2513 ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("a")); 2520 ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("a"));
2514 EXPECT_EQ(histogramValue + 1, 2521 EXPECT_EQ(histogramValue + 1,
2515 GetHistogramCount("Instant.TimeToFirstShowFromWeb")); 2522 GetHistogramCount("Instant.TimeToFirstShowFromWeb"));
2516 } 2523 }
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