Partially convert geolocation IPC to Mojo.

content/browser/web_contents/web_contents_impl.h

Index: content/browser/web_contents/web_contents_impl.h
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index 60fdc726a86e9005a816a5b400dbf8a380c3f9e7..bc17d4dc1801462c019ecbeab6703a999da1c3a9 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -52,6 +52,7 @@ class BrowserPluginGuestManager;
 class DateTimeChooserAndroid;
 class DownloadItem;
 class GeolocationDispatcherHost;
+class GeolocationServiceContext;
 class InterstitialPageImpl;
 class JavaScriptDialogManager;
 class ManifestManagerHost;
@@ -173,10 +174,6 @@ class CONTENT_EXPORT WebContentsImpl
 
   WebContentsView* GetView() const;
 
-  GeolocationDispatcherHost* geolocation_dispatcher_host() {
-    return geolocation_dispatcher_host_.get();
-  }
-
   ScreenOrientationDispatcherHost* screen_orientation_dispatcher_host() {
     return screen_orientation_dispatcher_host_.get();
   }
@@ -385,6 +382,7 @@ class CONTENT_EXPORT WebContentsImpl
       const std::vector<AXEventNotificationDetails>& details) override;
   RenderFrameHost* GetGuestByInstanceID(
       int browser_plugin_instance_id) override;
+  virtual GeolocationServiceContext* GetGeolocationServiceContext() override;

[Michael van Ouwerkerk, 2014/10/24 10:25:42]

Omit virtual

[blundell, 2014/10/24 11:45:18]

Done.

 #if defined(OS_WIN)
   virtual gfx::NativeViewAccessible GetParentNativeViewAccessible() override;

[Michael van Ouwerkerk, 2014/10/24 10:25:42]

Might as well delete it here too

[blundell, 2014/10/24 11:45:18]

Done.

 #endif
@@ -1193,6 +1191,8 @@ class CONTENT_EXPORT WebContentsImpl
   // Whether the last JavaScript dialog shown was suppressed. Used for testing.
   bool last_dialog_suppressed_;
 
+  scoped_ptr<GeolocationServiceContext> geolocation_service_context_;
+
   scoped_ptr<GeolocationDispatcherHost> geolocation_dispatcher_host_;
 
   scoped_ptr<MidiDispatcherHost> midi_dispatcher_host_;