| Index: extensions/browser/app_window/app_window_browsertest.cc
|
| diff --git a/extensions/browser/app_window/app_window_browsertest.cc b/extensions/browser/app_window/app_window_browsertest.cc
|
| index 180011105916d04ac0bb7c53527926a21fc7e154..74a4f951a08bc65eb414266fdb9188fc2c179a65 100644
|
| --- a/extensions/browser/app_window/app_window_browsertest.cc
|
| +++ b/extensions/browser/app_window/app_window_browsertest.cc
|
| @@ -11,18 +11,12 @@ namespace {
|
|
|
| typedef PlatformAppBrowserTest AppWindowBrowserTest;
|
|
|
| -// This test is disabled on Linux because of the unpredictable nature of native
|
| -// windows. We cannot assume that the window manager will insert any title bar
|
| -// at all, so the test may fail on certain window managers.
|
| -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
|
| -#define MAYBE_FrameInsetsForDefaultFrame DISABLED_FrameInsetsForDefaultFrame
|
| -#else
|
| -#define MAYBE_FrameInsetsForDefaultFrame FrameInsetsForDefaultFrame
|
| -#endif
|
| -
|
| // Verifies that the NativeAppWindows implement GetFrameInsets() correctly.
|
| // See http://crbug.com/346115
|
| -IN_PROC_BROWSER_TEST_F(AppWindowBrowserTest, MAYBE_FrameInsetsForDefaultFrame) {
|
| +// Note: This test assumes that the window manager adds a top title bar, and may
|
| +// fail on window managers that do not. (This may be true for certain window
|
| +// managers on Linux.) Since it passes on our bots, this is acceptable.
|
| +IN_PROC_BROWSER_TEST_F(AppWindowBrowserTest, FrameInsetsForDefaultFrame) {
|
| AppWindow* app_window = CreateTestAppWindow("{}");
|
| NativeAppWindow* native_window = app_window->GetBaseWindow();
|
| gfx::Insets insets = native_window->GetFrameInsets();
|
| @@ -34,18 +28,12 @@ IN_PROC_BROWSER_TEST_F(AppWindowBrowserTest, MAYBE_FrameInsetsForDefaultFrame) {
|
| CloseAppWindow(app_window);
|
| }
|
|
|
| -// This test is also disabled on Linux because frame: color is ignored on stable
|
| -// and beta channels (so it can fail the same as the previous test).
|
| -// TODO(benwells): Re-enable on Linux after frame: color is on stable.
|
| -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
|
| -#define MAYBE_FrameInsetsForColoredFrame DISABLED_FrameInsetsForColoredFrame
|
| -#else
|
| -#define MAYBE_FrameInsetsForColoredFrame FrameInsetsForColoredFrame
|
| -#endif
|
| -
|
| // Verifies that the NativeAppWindows implement GetFrameInsets() correctly.
|
| // See http://crbug.com/346115
|
| -IN_PROC_BROWSER_TEST_F(AppWindowBrowserTest, MAYBE_FrameInsetsForColoredFrame) {
|
| +// Note: This test may also fail on window managers that do not add top title
|
| +// bars, because frame: color is ignored on stable and beta channels.
|
| +// TODO(benwells): Remove this comment after frame: color is on stable.
|
| +IN_PROC_BROWSER_TEST_F(AppWindowBrowserTest, FrameInsetsForColoredFrame) {
|
| AppWindow* app_window =
|
| CreateTestAppWindow("{ \"frame\": { \"color\": \"#ffffff\" } }");
|
| NativeAppWindow* native_window = app_window->GetBaseWindow();
|
|
|