Follow up on https://bugs.webkit.org/show_bug.cgi?id=36535

Renames GeolocationServiceBridgeChromium.h to WebGeolocationService.h
Renames WebGeolocationServiceInterface to WebGeolocationService

TEST=geolocation_browsertest.cc

Review URL: http://codereview.chromium.org/1552002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43209 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 10 insertions, 8 deletions

diff --git a/chrome/renderer/geolocation_dispatcher.cc b/chrome/renderer/geolocation_dispatcher.cc
index 227add0..0a543daf6 100644
--- a/chrome/renderer/geolocation_dispatcher.cc
+++ b/chrome/renderer/geolocation_dispatcher.cc
@@ -7,8 +7,9 @@
 #include "base/command_line.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/renderer/render_view.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebCString.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebGeolocationServiceBridge.h"
 
 using WebKit::WebFrame;
 
@@ -69,7 +70,7 @@ int GeolocationDispatcher::attachBridge(
   return bridges_map_.Add(bridge);
 }
 
-void GeolocationDispatcher::dettachBridge(int bridge_id) {
+void GeolocationDispatcher::detachBridge(int bridge_id) {
   bridges_map_.Remove(bridge_id);
 }
 
diff --git a/chrome/renderer/geolocation_dispatcher.h b/chrome/renderer/geolocation_dispatcher.h
index c643ae9..8955dfa 100644
--- a/chrome/renderer/geolocation_dispatcher.h
+++ b/chrome/renderer/geolocation_dispatcher.h
@@ -9,7 +9,7 @@
 #include "base/id_map.h"
 #include "ipc/ipc_message.h"
 #include "googleurl/src/gurl.h"
-#include "third_party/WebKit/WebKit/chromium/public/GeolocationServiceBridgeChromium.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebGeolocationService.h"
 
 class GURL;
 class RenderView;
@@ -18,7 +18,7 @@ struct Geoposition;
 // GeolocationDispatcher is a delegate for Geolocation messages used by
 // WebKit.
 // It's the complement of GeolocationDispatcherHost (owned by RenderViewHost).
-class GeolocationDispatcher : public WebKit::WebGeolocationServiceInterface {
+class GeolocationDispatcher : public WebKit::WebGeolocationService {
  public:
   explicit GeolocationDispatcher(RenderView* render_view);
   virtual ~GeolocationDispatcher();
@@ -27,7 +27,7 @@ class GeolocationDispatcher : public WebKit::WebGeolocationServiceInterface {
   // handled. Called in render thread.
   bool OnMessageReceived(const IPC::Message& msg);
 
-  // WebKit::GeolocationServiceInterfaceChromium.
+  // WebKit::WebGeolocationService.
   void requestPermissionForFrame(int bridge_id, const WebKit::WebURL& url);
   void startUpdating(
       int bridge_id, const WebKit::WebURL& url, bool enableHighAccuracy);
@@ -35,7 +35,7 @@ class GeolocationDispatcher : public WebKit::WebGeolocationServiceInterface {
   void suspend(int bridge_id);
   void resume(int bridge_id);
   int attachBridge(WebKit::WebGeolocationServiceBridge* geolocation_service);
-  void dettachBridge(int bridge_id);
+  void detachBridge(int bridge_id);
 
  private:
   // Permission for using geolocation has been set.
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 0d84b7ab..e172fa9 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -4922,7 +4922,8 @@ bool RenderView::ScheduleFileChooser(
   return true;
 }
 
-WebKit::WebGeolocationServiceInterface* RenderView::getGeolocationService() {
+WebKit::WebGeolocationService* RenderView::geolocationService() {
+
   if (!geolocation_dispatcher_.get())
     geolocation_dispatcher_.reset(new GeolocationDispatcher(this));
   return geolocation_dispatcher_.get();
diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h
index b057a9a..a507317 100644
--- a/chrome/renderer/render_view.h
+++ b/chrome/renderer/render_view.h
@@ -280,7 +280,7 @@ class RenderView : public RenderWidget,
   virtual WebKit::WebNotificationPresenter* GetNotificationPresenter() {
     return notification_provider_.get();
   }
-  virtual WebKit::WebGeolocationServiceInterface* getGeolocationService();
+  virtual WebKit::WebGeolocationService* geolocationService();
 
   // Sets the content settings that back allowScripts(), allowImages(), and
   // allowPlugins().