Reland 2:Geolocation: move from content/browser to device/

content/browser/frame_host/render_frame_host_delegate.h

Index: content/browser/frame_host/render_frame_host_delegate.h
diff --git a/content/browser/frame_host/render_frame_host_delegate.h b/content/browser/frame_host/render_frame_host_delegate.h
index c1cb9fb65c9afabba75009c352e6d83dd11cd6ec..bc1317d7be12fd159dbacc621eb40ba564227b93 100644
--- a/content/browser/frame_host/render_frame_host_delegate.h
+++ b/content/browser/frame_host/render_frame_host_delegate.h
@@ -29,8 +29,11 @@ namespace IPC {
 class Message;
 }
 
-namespace content {
+namespace device {
 class GeolocationServiceContext;
+}
+
+namespace content {
 class InterstitialPage;
 class PageState;
 class RenderFrameHost;
@@ -149,7 +152,7 @@ class CONTENT_EXPORT RenderFrameHostDelegate {
       int browser_plugin_instance_id);
 
   // Gets the GeolocationServiceContext associated with this delegate.
-  virtual GeolocationServiceContext* GetGeolocationServiceContext();
+  virtual device::GeolocationServiceContext* GetGeolocationServiceContext();
 
   // Gets the WakeLockServiceContext associated with this delegate.
   virtual WakeLockServiceContext* GetWakeLockServiceContext();