diff options
| author | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-03 14:44:17 +0000 |
|---|---|---|
| committer | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-03 14:44:17 +0000 |
| commit | 828fc01666ebffefe167be592703e1b639a35c82 (patch) | |
| tree | 71604cbecbcbdcb65b682fac5a219659635ac378 /chrome/browser | |
| parent | a4d00e8ea96ed3103997b07a6717ae98bbd6b021 (diff) | |
| download | chromium_src-828fc01666ebffefe167be592703e1b639a35c82.zip chromium_src-828fc01666ebffefe167be592703e1b639a35c82.tar.gz chromium_src-828fc01666ebffefe167be592703e1b639a35c82.tar.bz2 | |
Disable LauncherFaviconLoaderBrowsertest.ManyLauncherIcons on Linux.
TBR=stevenjb@chromium.org
BUG=126101
Review URL: https://chromiumcodereview.appspot.com/10302008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135143 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/ui/views/ash/launcher/launcher_favicon_loader_browsertest.cc | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/chrome/browser/ui/views/ash/launcher/launcher_favicon_loader_browsertest.cc b/chrome/browser/ui/views/ash/launcher/launcher_favicon_loader_browsertest.cc index ed93c8c..a5e4c41 100644 --- a/chrome/browser/ui/views/ash/launcher/launcher_favicon_loader_browsertest.cc +++ b/chrome/browser/ui/views/ash/launcher/launcher_favicon_loader_browsertest.cc @@ -153,7 +153,16 @@ IN_PROC_BROWSER_TEST_F(LauncherFaviconLoaderBrowsertest, LargeLauncherIcon) { EXPECT_EQ(128, favicon_loader->GetFavicon().height()); } -IN_PROC_BROWSER_TEST_F(LauncherFaviconLoaderBrowsertest, ManyLauncherIcons) { +// Failing under linux_chromeos. +// See http://www.crbug.com/126101 +#ifdef OS_LINUX +#define MAYBE_ManyLauncherIcons DISABLED_ManyLauncherIcons +#else +#define MAYBE_ManyLauncherIcons ManyLauncherIcons +#endif + +IN_PROC_BROWSER_TEST_F(LauncherFaviconLoaderBrowsertest, + MAYBE_ManyLauncherIcons) { ASSERT_TRUE(test_server()->Start()); Browser* panel_browser; ASSERT_NO_FATAL_FAILURE( |