Index: chrome/browser/geolocation/geolocation_browsertest.cc |
diff --git a/chrome/browser/geolocation/geolocation_browsertest.cc b/chrome/browser/geolocation/geolocation_browsertest.cc |
index 704d98f9b5b0f402d88071fc6ae530d32c6a9a6a..f6dcd0e9a7fb70425f6bc160b19fcb59eb8066a4 100644 |
--- a/chrome/browser/geolocation/geolocation_browsertest.cc |
+++ b/chrome/browser/geolocation/geolocation_browsertest.cc |
@@ -617,7 +617,13 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, DISABLED_NoInfoBarBeforeStart) { |
CheckGeoposition(fake_latitude_, fake_longitude_); |
} |
-IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, TwoWatchesInOneFrame) { |
+// Crashes on linux. http://crbug.com/129065 |
+#if defined(OS_LINUX) |
+#define MAYBE_TwoWatchesInOneFrame DISABLED_TwoWatchesInOneFrame |
+#else |
+#define MAYBE_TwoWatchesInOneFrame TwoWatchesInOneFrame |
+#endif |
+IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, MAYBE_TwoWatchesInOneFrame) { |
html_for_tests_ = "files/geolocation/two_watches.html"; |
ASSERT_TRUE(Initialize(INITIALIZATION_NONE)); |
// First, set the JavaScript to navigate when it receives |final_position|. |