Revert rev 69137 due to incorrect change log.

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"
-#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"
 #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 601 matching lines @@
 
 void TestWebViewDelegate::focusAccessibilityObject(
     const WebAccessibilityObject& object) {
   shell_->accessibility_controller()->SetFocusedElement(object);
 }
 
 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() {
   return shell_->device_orientation_client_mock();
 }
 
 WebKit::WebSpeechInputController* TestWebViewDelegate::speechInputController(
     WebKit::WebSpeechInputListener* listener) {
   return shell_->CreateSpeechInputControllerMock(listener);
 }
@@ skipping 530 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)
@@ skipping 101 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_;
 }