summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/app_process_apitest.cc
diff options
context:
space:
mode:
authorcsharp@chromium.org <csharp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-08 16:44:53 +0000
committercsharp@chromium.org <csharp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-08 16:44:53 +0000
commitbc857a61d66774e68f079cef9e22c5d7b53bbb99 (patch)
tree74fecf5c90fad6bf0d8a76a8132806078b267424 /chrome/browser/extensions/app_process_apitest.cc
parente5de38dba8831405824b87be2bb891abf3c832f4 (diff)
downloadchromium_src-bc857a61d66774e68f079cef9e22c5d7b53bbb99.zip
chromium_src-bc857a61d66774e68f079cef9e22c5d7b53bbb99.tar.gz
chromium_src-bc857a61d66774e68f079cef9e22c5d7b53bbb99.tar.bz2
Disable AppApiTest.NavigateIntoAppProcess on Windows
TBR=creis@chromium.org BUG=238670 Review URL: https://codereview.chromium.org/14729015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198926 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 518d3b99..d0e6865 100644
--- a/chrome/browser/extensions/app_process_apitest.cc
+++ b/chrome/browser/extensions/app_process_apitest.cc
@@ -407,7 +407,13 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, AppProcessRedirectBack) {
// Ensure that re-navigating to a URL after installing or uninstalling it as an
// app correctly swaps the tab to the app process. (http://crbug.com/80621)
-IN_PROC_BROWSER_TEST_F(AppApiTest, NavigateIntoAppProcess) {
+// Fails on Windows. http://crbug.com/238670
+#if defined(OS_WIN)
+#define MAYBE_NavigateIntoAppProcess DISABLED_NavigateIntoAppProcess
+#else
+#define MAYBE_NavigateIntoAppProcess NavigateIntoAppProcess
+#endif
+IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_NavigateIntoAppProcess) {
extensions::ProcessMap* process_map = extensions::ExtensionSystem::Get(
browser()->profile())->extension_service()->process_map();