diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-05-11 20:53:37 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-05-16 13:54:48 +0100 |
| commit | 21d179b334e59e9a3bfcaed4c4430bef1bc5759d (patch) | |
| tree | 64e2bb6da27af6a5c93ca34f6051584aafbfcb9e /chrome/browser/geolocation/geolocation_permission_context_unittest.cc | |
| parent | 0c63f00edd6ed0482fd5cbcea937ca088baf7858 (diff) | |
| download | external_chromium-21d179b334e59e9a3bfcaed4c4430bef1bc5759d.zip external_chromium-21d179b334e59e9a3bfcaed4c4430bef1bc5759d.tar.gz external_chromium-21d179b334e59e9a3bfcaed4c4430bef1bc5759d.tar.bz2 | |
Merge Chromium at 10.0.621.0: Initial merge by git.
Change-Id: I070cc91c608dfa4a968a5a54c173260765ac8097
Diffstat (limited to 'chrome/browser/geolocation/geolocation_permission_context_unittest.cc')
| -rw-r--r-- | chrome/browser/geolocation/geolocation_permission_context_unittest.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/browser/geolocation/geolocation_permission_context_unittest.cc b/chrome/browser/geolocation/geolocation_permission_context_unittest.cc index 6e40862..0fadbe7 100644 --- a/chrome/browser/geolocation/geolocation_permission_context_unittest.cc +++ b/chrome/browser/geolocation/geolocation_permission_context_unittest.cc @@ -290,7 +290,14 @@ TEST_F(GeolocationPermissionContextTests, CancelGeolocationPermissionRequest) { requesting_frame_1, requesting_frame_0)); } -TEST_F(GeolocationPermissionContextTests, StopUpdating) { +// TODO(jknotten): Remove this test once we have completely +// switched over to client-based geolocation. +#if defined(ENABLE_CLIENT_BASED_GEOLOCATION) +#define MAYBE_StopUpdating DISABLED_StopUpdating +#else +#define MAYBE_StopUpdating StopUpdating +#endif +TEST_F(GeolocationPermissionContextTests, MAYBE_StopUpdating) { GURL requesting_frame("http://www.example.com/geolocation"); NavigateAndCommit(requesting_frame); EXPECT_EQ(0, contents()->infobar_delegate_count()); |