Remove legacy non-client-based geolocation code.

webkit/tools/test_shell/test_webview_delegate.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.
 
 // This file contains the implementation of TestWebViewDelegate, which serves
 // as the WebViewDelegate for the TestShellWebHost.  The host is expected to
 // have initialized a MessageLoop before these methods are called.
 
 #include "webkit/tools/test_shell/test_webview_delegate.h"
 
@@ skipping 15 matching lines @@
 #include "third_party/WebKit/WebKit/chromium/public/WebDeviceOrientationClientMock.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebCString.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebData.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebDataSource.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebDragData.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebHistoryItem.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebImage.h"
 #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"
 #include "third_party/WebKit/WebKit/chromium/public/WebNotificationPresenter.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebPluginParams.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebPoint.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebPopupMenu.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebRange.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebScreenInfo.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebSpeechInputController.h"
@@ skipping 16 matching lines @@
 #include "webkit/glue/webpreferences.h"
 #include "webkit/glue/window_open_disposition.h"
 #include "webkit/plugins/npapi/webplugin_impl.h"
 #include "webkit/plugins/npapi/plugin_list.h"
 #include "webkit/plugins/npapi/webplugin_delegate_impl.h"
 #include "webkit/tools/test_shell/accessibility_controller.h"
 #include "webkit/tools/test_shell/mock_spellcheck.h"
 #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"
 #include "webkit/tools/test_shell/drop_delegate.h"
 #endif
 
 using appcache::WebApplicationCacheHostImpl;
 using WebKit::WebAccessibilityObject;
 using WebKit::WebApplicationCacheHost;
 using WebKit::WebApplicationCacheHostClient;
@@ skipping 558 matching lines @@
 void TestWebViewDelegate::focusAccessibilityObject(
     const WebAccessibilityObject& object) {
   shell_->accessibility_controller()->SetFocusedElement(object);
 }
 
 WebNotificationPresenter* TestWebViewDelegate::notificationPresenter() {
   return shell_->notification_presenter();
 }
 
 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();
 }
 
 WebKit::WebSpeechInputController* TestWebViewDelegate::speechInputController(
     WebKit::WebSpeechInputListener* listener) {
   return shell_->CreateSpeechInputControllerMock(listener);
 }
 
@@ skipping 525 matching lines @@
                                                   bool is_permissive) {
   policy_delegate_enabled_ = is_custom;
   policy_delegate_is_permissive_ = is_permissive;
 }
 
 void TestWebViewDelegate::WaitForPolicyDelegate() {
   policy_delegate_enabled_ = true;
   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) {
   WebFrame* main_frame = webView->mainFrame();
 
   WebDataSource* data_source = main_frame->dataSource();
   if (!data_source)
     data_source = main_frame->provisionalDataSource();
   if (!data_source)
     return;
@@ skipping 100 matching lines @@
     else
       return L"main frame";
   } else {
     if (name.length())
       return L"frame \"" + name + L"\"";
     else
       return L"frame (anonymous)";
   }
 }
 
-#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;
 }
 
 WebRect TestWebViewDelegate::fake_window_rect() {
   return fake_rect_;
 }