Revert rev 69137 due to incorrect change log.

chrome/renderer/render_view.h

Index: chrome/renderer/render_view.h
diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h
index 8b0fb5bb5c7a03f566ac1007f4ca49617f503ca4..cdd210271264834f0ab89b6b781a39994d08f6f8 100644
--- a/chrome/renderer/render_view.h
+++ b/chrome/renderer/render_view.h
@@ -64,7 +64,6 @@ class DomAutomationController;
 class DOMUIBindings;
 class ExternalHostBindings;
 class FilePath;
-class GeolocationDispatcher;
 class GeolocationDispatcherOld;
 class GURL;
 class ListValue;
@@ -121,7 +120,6 @@ class WebDataSource;
 class WebDocument;
 class WebDragData;
 class WebFrame;
-class WebGeolocationClient;
 class WebGeolocationServiceInterface;
 class WebImage;
 class WebInputElement;
@@ -484,11 +482,7 @@ class RenderView : public RenderWidget,
   virtual void didClearAutoFillSelection(const WebKit::WebNode& node);
   virtual void didAcceptAutocompleteSuggestion(
       const WebKit::WebInputElement& element);
-#if defined(ENABLE_CLIENT_BASED_GEOLOCATION)
-  virtual WebKit::WebGeolocationClient* geolocationClient();
-#else
   virtual WebKit::WebGeolocationService* geolocationService();
-#endif
   virtual WebKit::WebSpeechInputController* speechInputController(
       WebKit::WebSpeechInputListener* listener);
   virtual WebKit::WebDeviceOrientationClient* deviceOrientationClient();
@@ -1380,11 +1374,7 @@ class RenderView : public RenderWidget,
   scoped_refptr<AudioMessageFilter> audio_message_filter_;
 
   // The geolocation dispatcher attached to this view, lazily initialized.
-#if ENABLE_CLIENT_BASED_GEOLOCATION
-  scoped_ptr<GeolocationDispatcher> geolocation_dispatcher_;
-#else
   scoped_ptr<GeolocationDispatcherOld> geolocation_dispatcher_;
-#endif
 
   // Handles accessibility requests into the renderer side, as well as
   // maintains the cache and other features of the accessibility tree.