Revert rev 69137 due to incorrect change log.

webkit/tools/test_shell/test_webview_delegate.h

 // 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.
 
 // TestWebViewDelegate class:
 // This class implements the WebViewDelegate methods for the test shell.  One
 // instance is owned by each TestShell.
 
 #ifndef WEBKIT_TOOLS_TEST_SHELL_TEST_WEBVIEW_DELEGATE_H_
 #define WEBKIT_TOOLS_TEST_SHELL_TEST_WEBVIEW_DELEGATE_H_
@@ skipping 123 matching lines @@
   virtual void setStatusText(const WebKit::WebString& text);
   virtual void startDragging(
       const WebKit::WebDragData& data, WebKit::WebDragOperationsMask mask,
       const WebKit::WebImage& image, const WebKit::WebPoint& offset);
   virtual void navigateBackForwardSoon(int offset);
   virtual int historyBackListCount();
   virtual int historyForwardListCount();
   virtual void focusAccessibilityObject(
       const WebKit::WebAccessibilityObject& object);
   virtual WebKit::WebNotificationPresenter* notificationPresenter();
-#if defined(ENABLE_CLIENT_BASED_GEOLOCATION)
-    WebKit::WebGeolocationClient* geolocationClient();
-#else
   virtual WebKit::WebGeolocationService* geolocationService();
-#endif
   virtual WebKit::WebDeviceOrientationClient* deviceOrientationClient();
   virtual WebKit::WebSpeechInputController* speechInputController(
       WebKit::WebSpeechInputListener*);
 
   // WebKit::WebWidgetClient
   virtual void didInvalidateRect(const WebKit::WebRect& rect);
   virtual void didScrollRect(int dx, int dy,
                              const WebKit::WebRect& clip_rect);
   virtual void scheduleComposite();
   virtual void didFocus();
@@ skipping 161 matching lines @@
   void SetEditCommand(const std::string& name, const std::string& value) {
     edit_command_name_ = name;
     edit_command_value_ = value;
   }
 
   void ClearEditCommand() {
     edit_command_name_.clear();
     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 {
     return last_context_menu_data_.get();
   }
 
   MockSpellCheck* mock_spellcheck() {
     return &mock_spellcheck_;
   }
@@ skipping 35 matching lines @@
   WebWidgetHost* GetWidgetHost();
 
   void UpdateForCommittedLoad(WebKit::WebFrame* frame, bool is_new_navigation);
   void UpdateURL(WebKit::WebFrame* frame);
   void UpdateSessionHistory(WebKit::WebFrame* frame);
   void UpdateSelectionClipboard(bool is_empty_selection);
 
   // 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.
   bool policy_delegate_enabled_;
 
   // Toggles the behavior of the policy delegate.  If true, then navigations
   // will be allowed.  Otherwise, they will be ignored (dropped).
   bool policy_delegate_is_permissive_;
 
@@ skipping 58 matching lines @@
   // true if we should block (set an empty request for) any requests
   bool request_return_null_;
 
   // Edit command associated to the current keyboard event.
   std::string edit_command_name_;
   std::string edit_command_value_;
 
   // The mock spellchecker used in TestWebViewDelegate::spellCheck().
   MockSpellCheck mock_spellcheck_;
 
-#if !defined(ENABLE_CLIENT_BASED_GEOLOCATION)
   scoped_ptr<TestGeolocationService> test_geolocation_service_;
-#endif
 
   DISALLOW_COPY_AND_ASSIGN(TestWebViewDelegate);
 };
 
 #endif  // WEBKIT_TOOLS_TEST_SHELL_TEST_WEBVIEW_DELEGATE_H_