Revert rev 69137 due to incorrect change log.

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 b791cf28043ece0bd4e78f349ecdcca83a79cc7a..cd95bad157a9770b092eefab90604f6668564360 100644
--- a/webkit/tools/test_shell/test_webview_delegate.cc
+++ b/webkit/tools/test_shell/test_webview_delegate.cc
@@ -33,9 +33,6 @@
 #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"
-#if defined(ENABLE_CLIENT_BASED_GEOLOCATION)
-#include "third_party/WebKit/WebKit/chromium/public/WebGeolocationClientMock.h"
-#endif
 #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"
@@ -657,15 +654,9 @@ WebNotificationPresenter* TestWebViewDelegate::notificationPresenter() {
   return shell_->notification_presenter();
 }
 
-#if defined(ENABLE_CLIENT_BASED_GEOLOCATION)
-WebKit::WebGeolocationClient* TestWebViewDelegate::geolocationClient() {
-  return shell_->geolocation_client_mock();
-}
-#else
 WebKit::WebGeolocationService* TestWebViewDelegate::geolocationService() {
   return GetTestGeolocationService();
 }
-#endif
 
 WebKit::WebDeviceOrientationClient*
 TestWebViewDelegate::deviceOrientationClient() {
@@ -1216,11 +1207,9 @@ 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 -----------------------------------------------------------
 
@@ -1342,13 +1331,11 @@ 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;