Client-based geolocation refactoring.

chrome/browser/geolocation/geolocation_permission_context_unittest.cc

Index: chrome/browser/geolocation/geolocation_permission_context_unittest.cc
diff --git a/chrome/browser/geolocation/geolocation_permission_context_unittest.cc b/chrome/browser/geolocation/geolocation_permission_context_unittest.cc
index 6e4086281a74d6af305115840b4402b254fe0b66..4ee93b12a29b470121b5cd679e381dd3d7ec51b0 100644
--- a/chrome/browser/geolocation/geolocation_permission_context_unittest.cc
+++ b/chrome/browser/geolocation/geolocation_permission_context_unittest.cc
@@ -290,6 +290,7 @@ TEST_F(GeolocationPermissionContextTests, CancelGeolocationPermissionRequest) {
           requesting_frame_1, requesting_frame_0));
 }
 
+#if !defined(ENABLE_CLIENT_BASED_GEOLOCATION)
 TEST_F(GeolocationPermissionContextTests, StopUpdating) {

[bulach, 2010/12/17 11:19:47]

the way we normally disable tests is:

// TODO(jknotten): remove this test once we fully switch to client-based. 
#if defined(ENABLE_CLIENT_BASED_GEOLOCATION)
#define MAYBE_StopUpdating StopUpdating
#else
#define MAYBE_StopUpdating DISABLED_StopUpdating
#endif
TEST_F(GeolocationPermissionContextTests, MAYBE_StopUpdating) {

   GURL requesting_frame("http://www.example.com/geolocation");
   NavigateAndCommit(requesting_frame);
@@ -312,6 +313,7 @@ TEST_F(GeolocationPermissionContextTests, StopUpdating) {
       profile()->GetGeolocationContentSettingsMap()->GetContentSetting(
           requesting_frame, requesting_frame));
 }
+#endif
 
 TEST_F(GeolocationPermissionContextTests, InvalidURL) {
   GURL invalid_embedder;