Client-based geolocation refactoring.

chrome/browser/geolocation/geolocation_permission_context_unittest.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/geolocation/geolocation_permission_context.h"
 
 #include "base/scoped_vector.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"
 #include "chrome/browser/geolocation/geolocation_permission_context.h"
@@ skipping 272 matching lines @@
   EXPECT_EQ(
       CONTENT_SETTING_ASK,
       profile()->GetGeolocationContentSettingsMap()->GetContentSetting(
           requesting_frame_0, requesting_frame_0));
   EXPECT_EQ(
       CONTENT_SETTING_ALLOW,
       profile()->GetGeolocationContentSettingsMap()->GetContentSetting(
           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());
   geolocation_permission_context_->RequestGeolocationPermission(
       process_id(), render_id(), bridge_id(), requesting_frame);
   EXPECT_EQ(1, contents()->infobar_delegate_count());
   ConfirmInfoBarDelegate* infobar_0 =
       contents()->GetInfoBarDelegateAt(0)->AsConfirmInfoBarDelegate();
   ASSERT_TRUE(infobar_0);
 
@@ skipping 111 matching lines @@
   ASSERT_TRUE(infobar_1);
   infobar_1->Accept();
   CheckPermissionMessageSentForTab(0, bridge_id() + 1, true);
   extra_tabs_[0]->RemoveInfoBar(infobar_1);
   EXPECT_EQ(infobar_1,
             extra_tabs_[0]->removed_infobar_delegate_);
   infobar_1->InfoBarClosed();
 
   extra_tabs_.reset();
 }