summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgrogan@chromium.org <dgrogan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-13 01:10:11 +0000
committerdgrogan@chromium.org <dgrogan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-13 01:10:11 +0000
commit0cfb748b3291b1919a8835021432b8803f1c229f (patch)
treee91b4ed4e153f862d6ffe9f8ebad908d66c6eec8
parent5271c5fcb4d13be1371eb3062202f6118a1638ad (diff)
downloadchromium_src-0cfb748b3291b1919a8835021432b8803f1c229f.zip
chromium_src-0cfb748b3291b1919a8835021432b8803f1c229f.tar.gz
chromium_src-0cfb748b3291b1919a8835021432b8803f1c229f.tar.bz2
Disable AppApiTest.AppProcessBackgroundInstances on windows
BUG=165834 TBR=mpcomplete@chromium.org Review URL: https://codereview.chromium.org/11549034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172745 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/extensions/app_process_apitest.cc8
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 d49f2c9..86abeca 100644
--- a/chrome/browser/extensions/app_process_apitest.cc
+++ b/chrome/browser/extensions/app_process_apitest.cc
@@ -242,7 +242,13 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, AppProcessInstances) {
// Test that hosted apps with the background permission but that set
// allow_js_access to false also use a process per app instance model.
// Separate instances should be in separate processes.
-IN_PROC_BROWSER_TEST_F(AppApiTest, AppProcessBackgroundInstances) {
+#if defined(OS_WIN)
+#define MAYBE_AppProcessBackgroundInstances \
+ DISABLED_AppProcessBackgroundInstances
+#else
+#define MAYBE_AppProcessBackgroundInstances AppProcessBackgroundInstances
+#endif
+IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_AppProcessBackgroundInstances) {
TestAppInstancesHelper("app_process_background_instances");
}