diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-03 00:32:13 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-03 00:32:13 +0000 |
| commit | d54ade6375cede951c26546f6194934f81bdc1ec (patch) | |
| tree | 20b3c4db8124fadd31788b87c0abdb948e68a38e | |
| parent | 51323acec2e11f1fddaf3948b2850ee84f8203cf (diff) | |
| download | chromium_src-d54ade6375cede951c26546f6194934f81bdc1ec.zip chromium_src-d54ade6375cede951c26546f6194934f81bdc1ec.tar.gz chromium_src-d54ade6375cede951c26546f6194934f81bdc1ec.tar.bz2 | |
Disable AppApiTest.AppProcess on Windows
TBR=mpcomplete
BUG=88316
TEST=AppApiTest.AppProcess
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91434 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/extensions/app_process_apitest.cc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/chrome/browser/extensions/app_process_apitest.cc b/chrome/browser/extensions/app_process_apitest.cc index 381fd49..898a16c 100644 --- a/chrome/browser/extensions/app_process_apitest.cc +++ b/chrome/browser/extensions/app_process_apitest.cc @@ -61,7 +61,15 @@ static void NavigateTabHelper(TabContents* contents, const GURL& url) { EXPECT_EQ(url, contents->controller().GetLastCommittedEntry()->url()); } -IN_PROC_BROWSER_TEST_F(AppApiTest, AppProcess) { +#if defined(OS_WIN) +// AppProcess sometimes hangs on Windows +// http://crbug.com/88316 +#define MAYBE_AppProcess DISABLED_AppProcess +#else +#define MAYBE_AppProcess AppProcess +#endif + +IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_AppProcess) { CommandLine::ForCurrentProcess()->AppendSwitch( switches::kDisablePopupBlocking); |