Revert rev 69137 due to incorrect change log.

chrome/renderer/render_view.cc

Index: chrome/renderer/render_view.cc
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index ca0c0e5d609666de8a4a6760bf38591f4502b24b..b639dd06df1dd6820f9acfcb029cd4046b6c7211 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -63,11 +63,7 @@
 #include "chrome/renderer/extensions/renderer_extension_bindings.h"
 #include "chrome/renderer/external_host_bindings.h"
 #include "chrome/renderer/external_popup_menu.h"
-#if ENABLE_CLIENT_BASED_GEOLOCATION
-#include "chrome/renderer/geolocation_dispatcher.h"
-#else
 #include "chrome/renderer/geolocation_dispatcher_old.h"
-#endif
 #include "chrome/renderer/ggl/ggl.h"
 #include "chrome/renderer/localized_error.h"
 #include "chrome/renderer/media/audio_renderer_impl.h"
@@ -5623,20 +5619,11 @@ void RenderView::OnPageTranslated() {
   autofill_helper_->FrameContentsAvailable(frame);
 }
 
-#if defined(ENABLE_CLIENT_BASED_GEOLOCATION)
-WebKit::WebGeolocationClient* RenderView::geolocationClient()
-{
-  if (!geolocation_dispatcher_.get())
-    geolocation_dispatcher_.reset(new GeolocationDispatcher(this));
-  return geolocation_dispatcher_.get();
-}
-#else
 WebKit::WebGeolocationService* RenderView::geolocationService() {
   if (!geolocation_dispatcher_.get())
     geolocation_dispatcher_.reset(new GeolocationDispatcherOld(this));
   return geolocation_dispatcher_.get();
 }
-#endif
 
 WebKit::WebSpeechInputController* RenderView::speechInputController(
     WebKit::WebSpeechInputListener* listener) {