Index: chrome/browser/extensions/app_process_apitest.cc |
diff --git a/chrome/browser/extensions/app_process_apitest.cc b/chrome/browser/extensions/app_process_apitest.cc |
index d73c77dc33b0ae8946d1728b9cc0c93a68a801e8..97728f1c57944771e0d885115bea85b70a2b40fc 100644 |
--- a/chrome/browser/extensions/app_process_apitest.cc |
+++ b/chrome/browser/extensions/app_process_apitest.cc |
@@ -411,12 +411,19 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, AppProcessRedirectBack) { |
GetRenderProcessHost()); |
} |
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA) |
+// TODO(erg): linux_aura bringup: http://crbug.com/163931 |
+#define MAYBE_NavigateIntoAppProcess DISABLED_NavigateIntoAppProcess |
+#else |
+#define MAYBE_NavigateIntoAppProcess NavigateIntoAppProcess |
+#endif |
+ |
// 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) |
// |
// Fails on Windows. http://crbug.com/238670 |
// Added logging to help diagnose the location of the problem. |
-IN_PROC_BROWSER_TEST_F(AppApiTest, NavigateIntoAppProcess) { |
+IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_NavigateIntoAppProcess) { |
extensions::ProcessMap* process_map = extensions::ExtensionSystem::Get( |
browser()->profile())->extension_service()->process_map(); |