Remove legacy non-client-based geolocation code.

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 b972506e8d7996dc2e24dc8b63e769bcf95405f9..9eedbabcdcc7817472f9ee404cd9c461a42a652c 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/load_progress_tracker.h"
 #include "chrome/renderer/localized_error.h"
@@ -5636,26 +5632,9 @@ void RenderView::OnPageTranslated() {
 }
 
 WebKit::WebGeolocationClient* RenderView::geolocationClient() {
-#if defined(ENABLE_CLIENT_BASED_GEOLOCATION)
   if (!geolocation_dispatcher_.get())
     geolocation_dispatcher_.reset(new GeolocationDispatcher(this));
   return geolocation_dispatcher_.get();
-#else
-  // TODO(jknotten): Remove once building with ENABLE_CLIENT_BASED_GEOLOCATION.
-  NOTREACHED();
-  return 0;
-#endif
-}
-
-WebKit::WebGeolocationService* RenderView::geolocationService() {
-#if defined(ENABLE_CLIENT_BASED_GEOLOCATION)
-  NOTREACHED();
-  return 0;
-#else
-  if (!geolocation_dispatcher_.get())
-    geolocation_dispatcher_.reset(new GeolocationDispatcherOld(this));
-  return geolocation_dispatcher_.get();
-#endif
 }
 
 WebKit::WebSpeechInputController* RenderView::speechInputController(