Remove legacy non-client-based geolocation code.

webkit/tools/test_shell/test_webview_delegate.cc

Index: webkit/tools/test_shell/test_webview_delegate.cc
diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc
index c811015dbbc41b6423b4529e579786e07d89c449..fccf8e7d78f0bd03f2cd05c8a382449081aef1be 100644
--- a/webkit/tools/test_shell/test_webview_delegate.cc
+++ b/webkit/tools/test_shell/test_webview_delegate.cc
@@ -33,6 +33,7 @@
 #include "third_party/WebKit/WebKit/chromium/public/WebFileError.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFileSystemCallbacks.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebGeolocationClientMock.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebKit.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebKitClient.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebNode.h"
@@ -69,15 +70,10 @@
 #include "webkit/tools/test_shell/notification_presenter.h"
 #include "webkit/tools/test_shell/simple_appcache_system.h"
 #include "webkit/tools/test_shell/simple_file_system.h"
-#include "webkit/tools/test_shell/test_geolocation_service.h"
 #include "webkit/tools/test_shell/test_navigation_controller.h"
 #include "webkit/tools/test_shell/test_shell.h"
 #include "webkit/tools/test_shell/test_web_worker.h"
 
-#if defined(ENABLE_CLIENT_BASED_GEOLOCATION)
-#include "third_party/WebKit/WebKit/chromium/public/WebGeolocationClientMock.h"
-#endif
-
 #if defined(OS_WIN)
 // TODO(port): make these files work everywhere.
 #include "webkit/tools/test_shell/drag_delegate.h"
@@ -656,25 +652,9 @@ WebNotificationPresenter* TestWebViewDelegate::notificationPresenter() {
 }
 
 WebKit::WebGeolocationClient* TestWebViewDelegate::geolocationClient() {
-#if defined(ENABLE_CLIENT_BASED_GEOLOCATION)
   return shell_->geolocation_client_mock();
-#else
-  // TODO(jknotten): Remove once building with ENABLE_CLIENT_BASED_GEOLOCATION.
-  NOTREACHED();
-  return 0;
-#endif
 }
 
-WebKit::WebGeolocationService* TestWebViewDelegate::geolocationService() {
-#if defined(ENABLE_CLIENT_BASED_GEOLOCATION)
-  NOTREACHED();
-  return 0;
-#else
-  return GetTestGeolocationService();
-#endif
-}
-
-
 WebKit::WebDeviceOrientationClient*
 TestWebViewDelegate::deviceOrientationClient() {
   return shell_->device_orientation_client_mock();
@@ -1220,12 +1200,6 @@ void TestWebViewDelegate::WaitForPolicyDelegate() {
   policy_delegate_should_notify_done_ = true;
 }
 
-#if !defined(ENABLE_CLIENT_BASED_GEOLOCATION)
-void TestWebViewDelegate::SetGeolocationPermission(bool allowed) {
-  GetTestGeolocationService()->SetGeolocationPermission(allowed);
-}
-#endif
-
 // Private methods -----------------------------------------------------------
 
 void TestWebViewDelegate::UpdateAddressBar(WebView* webView) {
@@ -1346,14 +1320,6 @@ std::wstring TestWebViewDelegate::GetFrameDescription(WebFrame* webframe) {
   }
 }
 
-#if !defined(ENABLE_CLIENT_BASED_GEOLOCATION)
-TestGeolocationService* TestWebViewDelegate::GetTestGeolocationService() {
-  if (!test_geolocation_service_.get())
-    test_geolocation_service_.reset(new TestGeolocationService);
-  return test_geolocation_service_.get();
-}
-#endif
-
 void TestWebViewDelegate::set_fake_window_rect(const WebRect& rect) {
   fake_rect_ = rect;
   using_fake_rect_ = true;