Remove legacy non-client-based geolocation code.

webkit/tools/test_shell/test_webview_delegate.h

Index: webkit/tools/test_shell/test_webview_delegate.h
diff --git a/webkit/tools/test_shell/test_webview_delegate.h b/webkit/tools/test_shell/test_webview_delegate.h
index 6283767b892e422e69ba9610ab4c56f67a24022b..8af86604dca300519ef281ca84b13c420e4aa0d4 100644
--- a/webkit/tools/test_shell/test_webview_delegate.h
+++ b/webkit/tools/test_shell/test_webview_delegate.h
@@ -140,12 +140,7 @@ class TestWebViewDelegate : public WebKit::WebViewClient,
   virtual void focusAccessibilityObject(
       const WebKit::WebAccessibilityObject& object);
   virtual WebKit::WebNotificationPresenter* notificationPresenter();
-
   virtual WebKit::WebGeolocationClient* geolocationClient();
-
-  // TODO(jknotten): Remove once building with ENABLE_CLIENT_BASED_GEOLOCATION.
-  virtual WebKit::WebGeolocationService* geolocationService();
-
   virtual WebKit::WebDeviceOrientationClient* deviceOrientationClient();
   virtual WebKit::WebSpeechInputController* speechInputController(
       WebKit::WebSpeechInputListener*);
@@ -327,10 +322,6 @@ class TestWebViewDelegate : public WebKit::WebViewClient,
     edit_command_value_.clear();
   }
 
-#if !defined(ENABLE_CLIENT_BASED_GEOLOCATION)
-  void SetGeolocationPermission(bool allowed);
-#endif
-
   void ClearContextMenuData();
 
   const WebKit::WebContextMenuData* last_context_menu_data() const {
@@ -385,11 +376,6 @@ class TestWebViewDelegate : public WebKit::WebViewClient,
   // Get a string suitable for dumping a frame to the console.
   std::wstring GetFrameDescription(WebKit::WebFrame* webframe);
 
-#if !defined(ENABLE_CLIENT_BASED_GEOLOCATION)
-  // Returns a TestGeolocationService owned by this delegate.
-  TestGeolocationService* GetTestGeolocationService();
-#endif
-
   // Causes navigation actions just printout the intended navigation instead
   // of taking you to the page. This is used for cases like mailto, where you
   // don't actually want to open the mail program.
@@ -467,9 +453,6 @@ class TestWebViewDelegate : public WebKit::WebViewClient,
   // The mock spellchecker used in TestWebViewDelegate::spellCheck().
   MockSpellCheck mock_spellcheck_;
 
-  // TODO(jknotten): Remove once building with ENABLE_CLIENT_BASED_GEOLOCATION.
-  scoped_ptr<TestGeolocationService> test_geolocation_service_;
-
   DISALLOW_COPY_AND_ASSIGN(TestWebViewDelegate);
 };