diff options
| author | mgiuca <mgiuca@chromium.org> | 2014-10-14 10:39:15 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-14 17:39:35 +0000 |
| commit | 26afd5092277b880ce8d253b9ef19c3406156bc3 (patch) | |
| tree | 05e232800224448d73e01dec0f0f4baeff2590c8 /extensions | |
| parent | b919fef97f4868147f14cbfd6561b16b21552257 (diff) | |
| download | chromium_src-26afd5092277b880ce8d253b9ef19c3406156bc3.zip chromium_src-26afd5092277b880ce8d253b9ef19c3406156bc3.tar.gz chromium_src-26afd5092277b880ce8d253b9ef19c3406156bc3.tar.bz2 | |
Re-enable AppWindowBrowserTest.FrameInsetsForColoredFrame on Linux.
This was disabled because it depended on frame: color which was only
available on dev. This feature has been on stable since Chrome 36
(r269278) so the test should pass on all channels.
Also removed test slated for removal once there is no possibility of
problems with frame colours in different channels.
BUG=339558
Review URL: https://codereview.chromium.org/643243004
Cr-Commit-Position: refs/heads/master@{#299503}
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/browser/app_window/app_window_browsertest.cc | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/extensions/browser/app_window/app_window_browsertest.cc b/extensions/browser/app_window/app_window_browsertest.cc index 1800111..784c9b1 100644 --- a/extensions/browser/app_window/app_window_browsertest.cc +++ b/extensions/browser/app_window/app_window_browsertest.cc @@ -34,18 +34,9 @@ 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) { +IN_PROC_BROWSER_TEST_F(AppWindowBrowserTest, FrameInsetsForColoredFrame) { AppWindow* app_window = CreateTestAppWindow("{ \"frame\": { \"color\": \"#ffffff\" } }"); NativeAppWindow* native_window = app_window->GetBaseWindow(); |