diff options
| author | jknotten@chromium.org <jknotten@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-17 12:13:17 +0000 |
|---|---|---|
| committer | jknotten@chromium.org <jknotten@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-17 12:13:17 +0000 |
| commit | 57bb697af76a69656a4389187ded15aa6d3c4c49 (patch) | |
| tree | 007bc689669f223106897cb99175191d288de90a /chrome/browser/geolocation | |
| parent | e71c77ab8cd5bfe83345825e7528ab750abfd9c2 (diff) | |
| download | chromium_src-57bb697af76a69656a4389187ded15aa6d3c4c49.zip chromium_src-57bb697af76a69656a4389187ded15aa6d3c4c49.tar.gz chromium_src-57bb697af76a69656a4389187ded15aa6d3c4c49.tar.bz2 | |
Client-based geolocation refactoring.
Remove unnecessary double->Int64->double conversion.
Conditionally Disable GeolocationPermissionContextTests.StopUpdating for
client-based geolocation.
BUG=59907
Review URL: http://codereview.chromium.org/5984001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69538 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/geolocation')
| -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()); |