summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/app_process_apitest.cc
diff options
context:
space:
mode:
authorhashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-10 08:36:59 +0000
committerhashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-10 08:36:59 +0000
commit4ef849e6d1d7617986754b96eee95042c4021033 (patch)
treef5d3ebc0f4e2f77ce010a7c7f61d199eb530f1ee /chrome/browser/extensions/app_process_apitest.cc
parent3352862d406a00e195a5fcecd250e3c0946c25c9 (diff)
downloadchromium_src-4ef849e6d1d7617986754b96eee95042c4021033.zip
chromium_src-4ef849e6d1d7617986754b96eee95042c4021033.tar.gz
chromium_src-4ef849e6d1d7617986754b96eee95042c4021033.tar.bz2
Disable AppApiTest.AppProcessInstances on Windows
BUG=248047 TBR=kjellander@chromium.org NOTRY=True Review URL: https://codereview.chromium.org/16625005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205165 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/app_process_apitest.cc')
-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 545f94b..23a6548 100644
--- a/chrome/browser/extensions/app_process_apitest.cc
+++ b/chrome/browser/extensions/app_process_apitest.cc
@@ -258,7 +258,13 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_AppProcess) {
// Test that hosted apps without the background permission use a process per app
// instance model, such that separate instances are in separate processes.
-IN_PROC_BROWSER_TEST_F(AppApiTest, AppProcessInstances) {
+// Flaky on Windows. http://crbug.com/248047
+#if defined(OS_WIN)
+#define MAYBE_AppProcessInstances DISABLED_AppProcessInstances
+#else
+#define MAYBE_AppProcessInstances AppProcessInstances
+#endif
+IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_AppProcessInstances) {
TestAppInstancesHelper("app_process_instances");
}