diff options
| author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-28 19:01:51 +0000 |
|---|---|---|
| committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-28 19:01:51 +0000 |
| commit | 9b0a26328cf2da05d14fece83e3210e5585b5869 (patch) | |
| tree | cd7bcacfc020ea2a642d478846b6c026bf335327 | |
| parent | 01d2d279b7769fabacac94e2b6d12ba1e18344e2 (diff) | |
| download | chromium_src-9b0a26328cf2da05d14fece83e3210e5585b5869.zip chromium_src-9b0a26328cf2da05d14fece83e3210e5585b5869.tar.gz chromium_src-9b0a26328cf2da05d14fece83e3210e5585b5869.tar.bz2 | |
Test ExtensionApiTest.ProcessesVsTaskManager times out on Windows, disabling.
Probably due to 119612.
TBR=yoshiki@chromium.org
BUG=111787
TEST=
Review URL: https://chromiumcodereview.appspot.com/9223040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119621 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/extensions/extension_processes_apitest.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/chrome/browser/extensions/extension_processes_apitest.cc b/chrome/browser/extensions/extension_processes_apitest.cc index 3b9676e..85ff94d 100644 --- a/chrome/browser/extensions/extension_processes_apitest.cc +++ b/chrome/browser/extensions/extension_processes_apitest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -24,7 +24,13 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Processes) { ASSERT_TRUE(RunExtensionTest("processes/api")) << message_; } -IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ProcessesVsTaskManager) { +// http://crbug.com/111787 +#ifdef OS_WIN +#define MAYBE_ProcessesVsTaskManager DISABLED_ProcessesVsTaskManager +#else +#define MAYBE_ProcessesVsTaskManager ProcessesVsTaskManager +#endif +IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_ProcessesVsTaskManager) { CommandLine::ForCurrentProcess()->AppendSwitch( switches::kEnableExperimentalExtensionApis); |