Commit 784198a0 authored by Robert Liao's avatar Robert Liao Committed by Commit Bot

Disable MacViews Tests Impacted by Activation Issues

BUG=823543

Change-Id: Id6baed02122845092462a8166754acb28bbd3a9e
Reviewed-on: https://chromium-review.googlesource.com/972329Reviewed-by: default avatarElly Fong-Jones <ellyjones@chromium.org>
Commit-Queue: Robert Liao <robliao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#544733}
parent f29c539e
......@@ -4,6 +4,7 @@
#include "chrome/browser/ui/views/location_bar/location_icon_view.h"
#include "build/build_config.h"
#include "chrome/browser/ui/views/frame/browser_view.h"
#include "chrome/browser/ui/views/location_bar/location_bar_view.h"
#include "chrome/browser/ui/views/page_info/page_info_bubble_view.h"
......@@ -60,8 +61,16 @@ IN_PROC_BROWSER_TEST_F(LocationIconViewTest, HideOnSecondClick) {
PageInfoBubbleView::GetShownBubbleType());
}
#if defined(OS_MACOSX)
// Widget activation doesn't work on Mac: https://crbug.com/823543
#define MAYBE_ActivateFirstInactiveBubbleForAccessibility \
DISABLED_ActivateFirstInactiveBubbleForAccessibility
#else
#define MAYBE_ActivateFirstInactiveBubbleForAccessibility \
ActivateFirstInactiveBubbleForAccessibility
#endif
IN_PROC_BROWSER_TEST_F(LocationIconViewTest,
ActivateFirstInactiveBubbleForAccessibility) {
MAYBE_ActivateFirstInactiveBubbleForAccessibility) {
BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser());
LocationBarView* location_bar_view = browser_view->GetLocationBarView();
EXPECT_FALSE(
......
......@@ -392,7 +392,14 @@ IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorMultiTabTest, SelectSecond) {
EXPECT_CALL(*auth_requestor_.get(), CancelCertificateSelection());
}
IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorMultiProfileTest, Escape) {
#if defined(OS_MACOSX)
// Widget activation doesn't work on Mac: https://crbug.com/823543
#define MAYBE_Escape DISABLED_Escape
#else
#define MAYBE_Escape Escape
#endif
IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorMultiProfileTest,
MAYBE_Escape) {
EXPECT_CALL(*auth_requestor_1_.get(), CertificateSelected(nullptr, nullptr));
EXPECT_TRUE(ui_test_utils::SendKeyPressSync(
......@@ -406,8 +413,14 @@ IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorMultiProfileTest, Escape) {
EXPECT_CALL(*auth_requestor_.get(), CancelCertificateSelection());
}
#if defined(OS_MACOSX)
// Widget activation doesn't work on Mac: https://crbug.com/823543
#define MAYBE_SelectDefault DISABLED_SelectDefault
#else
#define MAYBE_SelectDefault SelectDefault
#endif
IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorMultiProfileTest,
SelectDefault) {
MAYBE_SelectDefault) {
EXPECT_CALL(*auth_requestor_1_.get(),
CertificateSelected(cert_identity_1_->certificate(),
cert_identity_1_->ssl_private_key()));
......
......@@ -259,10 +259,23 @@ void ToolbarViewTest::RunToolbarCycleFocusTest(Browser* browser) {
EXPECT_EQ(ids[i], reverse_ids[count - 2 - i]);
}
IN_PROC_BROWSER_TEST_F(ToolbarViewTest, ToolbarCycleFocus) {
#if defined(OS_MACOSX)
// Widget activation doesn't work on Mac: https://crbug.com/823543
#define MAYBE_ToolbarCycleFocus DISABLED_ToolbarCycleFocus
#else
#define MAYBE_ToolbarCycleFocus ToolbarCycleFocus
#endif
IN_PROC_BROWSER_TEST_F(ToolbarViewTest, MAYBE_ToolbarCycleFocus) {
RunToolbarCycleFocusTest(browser());
}
#if defined(OS_MACOSX)
// Widget activation doesn't work on Mac: https://crbug.com/823543
#define MAYBE_ToolbarCycleFocusWithBookmarkBar \
DISABLED_ToolbarCycleFocusWithBookmarkBar
#else
#define MAYBE_ToolbarCycleFocusWithBookmarkBar ToolbarCycleFocusWithBookmarkBar
#endif
IN_PROC_BROWSER_TEST_F(ToolbarViewTest, ToolbarCycleFocusWithBookmarkBar) {
CommandUpdater* updater = browser()->command_controller();
updater->ExecuteCommand(IDC_SHOW_BOOKMARK_BAR);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment