diff options
| author | csharp@chromium.org <csharp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-07 20:02:43 +0000 |
|---|---|---|
| committer | csharp@chromium.org <csharp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-07 20:02:43 +0000 |
| commit | b3b3967f84a6ea0564b15c99f9c0f0ccfa8bd0e5 (patch) | |
| tree | 64dc39afa405683e8b5fd52f2768dc109fd52252 | |
| parent | f54d4ba0d0e85151ff2c8ab9b77e37e6045f14f4 (diff) | |
| download | chromium_src-b3b3967f84a6ea0564b15c99f9c0f0ccfa8bd0e5.zip chromium_src-b3b3967f84a6ea0564b15c99f9c0f0ccfa8bd0e5.tar.gz chromium_src-b3b3967f84a6ea0564b15c99f9c0f0ccfa8bd0e5.tar.bz2 | |
Disable AppApiTest.BookmarkAppGetsNormalProcess on Windows
TBR=creis@chromium.org
BUG=238777
Review URL: https://codereview.chromium.org/14780007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198782 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/extensions/app_process_apitest.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/extensions/app_process_apitest.cc b/chrome/browser/extensions/app_process_apitest.cc index 574f83e..518d3b99 100644 --- a/chrome/browser/extensions/app_process_apitest.cc +++ b/chrome/browser/extensions/app_process_apitest.cc @@ -278,7 +278,13 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_AppProcessBackgroundInstances) { // Tests that bookmark apps do not use the app process model and are treated // like normal web pages instead. http://crbug.com/104636. -IN_PROC_BROWSER_TEST_F(AppApiTest, BookmarkAppGetsNormalProcess) { +// Timing out on Windows. http://crbug.com/238777 +#if defined(OS_WIN) +#define MAYBE_BookmarkAppGetsNormalProcess DISABLED_BookmarkAppGetsNormalProcess +#else +#define MAYBE_BookmarkAppGetsNormalProcess BookmarkAppGetsNormalProcess +#endif +IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_BookmarkAppGetsNormalProcess) { ExtensionService* service = extensions::ExtensionSystem::Get( browser()->profile())->extension_service(); extensions::ProcessMap* process_map = service->process_map(); |