diff options
| author | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-21 22:30:06 +0000 |
|---|---|---|
| committer | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-21 22:30:06 +0000 |
| commit | 3109f75e1be14044be030d1919e272a86ab5d418 (patch) | |
| tree | 342d096c9442cf83e6246831d5a57ab87eede76b /chrome/browser/geolocation | |
| parent | 47515abd6b3ae36b989683c5663df06d6bcb919b (diff) | |
| download | chromium_src-3109f75e1be14044be030d1919e272a86ab5d418.zip chromium_src-3109f75e1be14044be030d1919e272a86ab5d418.tar.gz chromium_src-3109f75e1be14044be030d1919e272a86ab5d418.tar.bz2 | |
Disable GeolocationBrowserTest.TwoWatchesInOneFrame on linux.
TBR=bartfab@chromium.org
BUG=129065
TEST=
Review URL: https://chromiumcodereview.appspot.com/10420002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138152 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/geolocation')
| -rw-r--r-- | chrome/browser/geolocation/geolocation_browsertest.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/geolocation/geolocation_browsertest.cc b/chrome/browser/geolocation/geolocation_browsertest.cc index 704d98f..f6dcd0e 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|. |