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 97146b389edd42ca1440fe08ab1ed8cf26db5a81..592237c34b814fc67595ca024ac4849e1b88c1d4 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();
   }
@@ -393,6 +390,7 @@ class CONTENT_EXPORT WebContentsImpl
       const std::vector<AXEventNotificationDetails>& details) OVERRIDE;
   virtual RenderFrameHost* GetGuestByInstanceID(int browser_plugin_instance_id)
       OVERRIDE;
+  virtual GeolocationServiceContext* GetGeolocationServiceContext() OVERRIDE;
 #if defined(OS_WIN)
   virtual gfx::NativeViewAccessible GetParentNativeViewAccessible() OVERRIDE;
 #endif
@@ -1223,6 +1221,8 @@ class CONTENT_EXPORT WebContentsImpl
   // Whether the last JavaScript dialog shown was suppressed. Used for testing.
   bool last_dialog_suppressed_;
 
+  scoped_ptr<GeolocationServiceContext> geolocation_context_;

[Michael van Ouwerkerk, 2014/10/09 13:11:23]

Nit: geolocation_service_context_

[blundell, 2014/10/21 12:27:50]

Done.

+
   scoped_ptr<GeolocationDispatcherHost> geolocation_dispatcher_host_;
 
   scoped_ptr<MidiDispatcherHost> midi_dispatcher_host_;