diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-22 15:11:15 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-22 15:11:15 +0000 |
| commit | be8751c1fe155a0c7405ccda69458b0902b97440 (patch) | |
| tree | 0f3ac0df9796b8dd9943c08ac66514f9897b4cd5 | |
| parent | 59a038829856eda37b34592181bf752c0322cad7 (diff) | |
| download | chromium_src-be8751c1fe155a0c7405ccda69458b0902b97440.zip chromium_src-be8751c1fe155a0c7405ccda69458b0902b97440.tar.gz chromium_src-be8751c1fe155a0c7405ccda69458b0902b97440.tar.bz2 | |
Disable crashy TaskManagerBrowserTest.ReloadExtension on Windows.
TBR=aa
TEST=still crashy on Windows
BUG=42315
Review URL: http://codereview.chromium.org/1737004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45315 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/task_manager_browsertest.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/task_manager_browsertest.cc b/chrome/browser/task_manager_browsertest.cc index ef1418e..08d5490 100644 --- a/chrome/browser/task_manager_browsertest.cc +++ b/chrome/browser/task_manager_browsertest.cc @@ -186,7 +186,13 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, KillExtensionAndReload) { } // Regression test for http://crbug.com/18693. -IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, ReloadExtension) { +#if defined(OS_WIN) +// Crashy, http://crbug.com/42315. +#define MAYBE_ReloadExtension DISABLED_ReloadExtension +#else +#define MAYBE_ReloadExtension ReloadExtension +#endif +IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, MAYBE_ReloadExtension) { // Show the task manager. This populates the model, and helps with debugging // (you see the task manager). browser()->window()->ShowTaskManager(); |