Commit 16df02b6 authored by Robert Liao's avatar Robert Liao Committed by Commit Bot

Disable Views Tests That Hit A Mac Internal Assert

BUG=823490

Change-Id: I034afe4ed185cb7856f34666acaf24aae2084c70
Reviewed-on: https://chromium-review.googlesource.com/972552Reviewed-by: default avatarElly Fong-Jones <ellyjones@chromium.org>
Commit-Queue: Robert Liao <robliao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#544731}
parent e8298dd1
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "build/build_config.h"
#include "chrome/browser/ui/exclusive_access/fullscreen_controller_test.h" #include "chrome/browser/ui/exclusive_access/fullscreen_controller_test.h"
#include "chrome/browser/ui/views/exclusive_access_bubble_views.h" #include "chrome/browser/ui/views/exclusive_access_bubble_views.h"
#include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/frame/browser_view.h"
...@@ -37,11 +38,17 @@ class ExclusiveAccessBubbleViewsTest : public FullscreenControllerTest, ...@@ -37,11 +38,17 @@ class ExclusiveAccessBubbleViewsTest : public FullscreenControllerTest,
DISALLOW_COPY_AND_ASSIGN(ExclusiveAccessBubbleViewsTest); DISALLOW_COPY_AND_ASSIGN(ExclusiveAccessBubbleViewsTest);
}; };
#if defined(OS_MACOSX)
// Encounters an internal MacOS assert: http://crbug.com/823490
#define MAYBE_NativeClose DISABLED_NativeClose
#else
#define MAYBE_NativeClose NativeClose
#endif
// Simulate obscure codepaths resulting in the bubble Widget being closed before // Simulate obscure codepaths resulting in the bubble Widget being closed before
// the ExclusiveAccessBubbleViews destructor asks for it. If a close bypasses // the ExclusiveAccessBubbleViews destructor asks for it. If a close bypasses
// the destructor, animations could still be running that attempt to manipulate // the destructor, animations could still be running that attempt to manipulate
// a destroyed Widget and crash. // a destroyed Widget and crash.
IN_PROC_BROWSER_TEST_F(ExclusiveAccessBubbleViewsTest, NativeClose) { IN_PROC_BROWSER_TEST_F(ExclusiveAccessBubbleViewsTest, MAYBE_NativeClose) {
EXPECT_FALSE(bubble()); EXPECT_FALSE(bubble());
EnterActiveTabFullscreen(); EnterActiveTabFullscreen();
EXPECT_TRUE(bubble()); EXPECT_TRUE(bubble());
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/frame/browser_view.h"
#include "base/macros.h" #include "base/macros.h"
#include "build/build_config.h"
#include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_commands.h"
#include "chrome/browser/ui/views/location_bar/location_bar_view.h" #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
#include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/in_process_browser_test.h"
...@@ -27,7 +28,13 @@ class BrowserViewTest : public InProcessBrowserTest { ...@@ -27,7 +28,13 @@ class BrowserViewTest : public InProcessBrowserTest {
} // namespace } // namespace
IN_PROC_BROWSER_TEST_F(BrowserViewTest, FullscreenClearsFocus) { #if defined(OS_MACOSX)
// Encounters an internal MacOS assert: http://crbug.com/823490
#define MAYBE_FullscreenClearsFocus DISABLED_FullscreenClearsFocus
#else
#define MAYBE_FullscreenClearsFocus FullscreenClearsFocus
#endif
IN_PROC_BROWSER_TEST_F(BrowserViewTest, MAYBE_FullscreenClearsFocus) {
BrowserView* browser_view = static_cast<BrowserView*>(browser()->window()); BrowserView* browser_view = static_cast<BrowserView*>(browser()->window());
LocationBarView* location_bar_view = browser_view->GetLocationBarView(); LocationBarView* location_bar_view = browser_view->GetLocationBarView();
FocusManager* focus_manager = browser_view->GetFocusManager(); FocusManager* focus_manager = browser_view->GetFocusManager();
......
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