diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-02 18:11:00 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-02 18:11:00 +0000 |
| commit | 82d16690b7c863ea4c16dbade049fe0be658cf7d (patch) | |
| tree | f169542bb0a1d018e49be0d06169b795fdb80401 /chrome | |
| parent | f5ac274b58be0e9161426f31dee0766db9b716a0 (diff) | |
| download | chromium_src-82d16690b7c863ea4c16dbade049fe0be658cf7d.zip chromium_src-82d16690b7c863ea4c16dbade049fe0be658cf7d.tar.gz chromium_src-82d16690b7c863ea4c16dbade049fe0be658cf7d.tar.bz2 | |
linux: Disable OldPanelBrowserTest.MinimizeImmediatelyAfterRestore and AnimateBounds
BUG=135377
TEST=none
TBR=jennb
Review URL: https://chromiumcodereview.appspot.com/10689072
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145162 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/ui/panels/old_panel_browsertest.cc | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/chrome/browser/ui/panels/old_panel_browsertest.cc b/chrome/browser/ui/panels/old_panel_browsertest.cc index 48f45ac..88fd60f 100644 --- a/chrome/browser/ui/panels/old_panel_browsertest.cc +++ b/chrome/browser/ui/panels/old_panel_browsertest.cc @@ -472,7 +472,14 @@ IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest, ResizePanel) { panel->Close(); } -IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest, AnimateBounds) { +// http://crbug.com/135377 +#if defined(OS_LINUX) +#define MAYBE_AnimateBounds DISABLED_AnimateBounds +#else +#define MAYBE_AnimateBounds AnimateBounds +#endif + +IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest, MAYBE_AnimateBounds) { Panel* panel = CreatePanelWithBounds("PanelTest", gfx::Rect(0, 0, 100, 100)); scoped_ptr<NativePanelTesting> panel_testing( CreateNativePanelTesting(panel)); @@ -1213,8 +1220,17 @@ IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest, DrawAttentionResetOnClick) { panel->Close(); } + +// http://crbug.com/135377 +#if defined(OS_LINUX) +#define MAYBE_MinimizeImmediatelyAfterRestore \ + DISABLED_MinimizeImmediatelyAfterRestore +#else +#define MAYBE_MinimizeImmediatelyAfterRestore MinimizeImmediatelyAfterRestore +#endif + IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest, - MinimizeImmediatelyAfterRestore) { + MAYBE_MinimizeImmediatelyAfterRestore) { CreatePanelParams params("Panel Test", gfx::Rect(), SHOW_AS_ACTIVE); Panel* panel = CreatePanelWithParams(params); scoped_ptr<NativePanelTesting> native_panel_testing( |