Partially convert geolocation IPC to Mojo.

content/browser/geolocation/geolocation_dispatcher_host.cc

Index: content/browser/geolocation/geolocation_dispatcher_host.cc
diff --git a/content/browser/geolocation/geolocation_dispatcher_host.cc b/content/browser/geolocation/geolocation_dispatcher_host.cc
index a778dfab2a3092096f9f43514f2c7b0d1475139d..6c8271071182d70e5c0d041ebe9f9278148103a3 100644
--- a/content/browser/geolocation/geolocation_dispatcher_host.cc
+++ b/content/browser/geolocation/geolocation_dispatcher_host.cc
@@ -7,64 +7,13 @@
 #include <utility>
 
 #include "base/bind.h"
-#include "base/metrics/histogram.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/browser/renderer_host/render_message_filter.h"
-#include "content/browser/renderer_host/render_process_host_impl.h"
-#include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
-#include "content/public/browser/browser_context.h"
 #include "content/public/browser/content_browser_client.h"
-#include "content/public/common/geoposition.h"
 #include "content/common/geolocation_messages.h"
 
 namespace content {
-namespace {
-
-// Geoposition error codes for reporting in UMA.
-enum GeopositionErrorCode {
-  // NOTE: Do not renumber these as that would confuse interpretation of
-  // previously logged data. When making changes, also update the enum list
-  // in tools/metrics/histograms/histograms.xml to keep it in sync.
-
-  // There was no error.
-  GEOPOSITION_ERROR_CODE_NONE = 0,
-
-  // User denied use of geolocation.
-  GEOPOSITION_ERROR_CODE_PERMISSION_DENIED = 1,
-
-  // Geoposition could not be determined.
-  GEOPOSITION_ERROR_CODE_POSITION_UNAVAILABLE = 2,
-
-  // Timeout.
-  GEOPOSITION_ERROR_CODE_TIMEOUT = 3,
-
-  // NOTE: Add entries only immediately above this line.
-  GEOPOSITION_ERROR_CODE_COUNT = 4
-};
-
-void RecordGeopositionErrorCode(Geoposition::ErrorCode error_code) {
-  GeopositionErrorCode code = GEOPOSITION_ERROR_CODE_NONE;
-  switch (error_code) {
-    case Geoposition::ERROR_CODE_NONE:
-      code = GEOPOSITION_ERROR_CODE_NONE;
-      break;
-    case Geoposition::ERROR_CODE_PERMISSION_DENIED:
-      code = GEOPOSITION_ERROR_CODE_PERMISSION_DENIED;
-      break;
-    case Geoposition::ERROR_CODE_POSITION_UNAVAILABLE:
-      code = GEOPOSITION_ERROR_CODE_POSITION_UNAVAILABLE;
-      break;
-    case Geoposition::ERROR_CODE_TIMEOUT:
-      code = GEOPOSITION_ERROR_CODE_TIMEOUT;
-      break;
-  }
-  UMA_HISTOGRAM_ENUMERATION("Geolocation.LocationUpdate.ErrorCode",
-                            code,
-                            GEOPOSITION_ERROR_CODE_COUNT);
-}
-
-}  // namespace
 
 GeolocationDispatcherHost::PendingPermission::PendingPermission(
     int render_frame_id,
@@ -81,7 +30,6 @@ GeolocationDispatcherHost::PendingPermission::~PendingPermission() {
 GeolocationDispatcherHost::GeolocationDispatcherHost(
     WebContents* web_contents)
     : WebContentsObserver(web_contents),
-      paused_(false),
       weak_factory_(this) {
   // This is initialized by WebContentsImpl. Do not add any non-trivial
   // initialization here, defer to OnStartUpdating which is triggered whenever
@@ -91,19 +39,6 @@ GeolocationDispatcherHost::GeolocationDispatcherHost(
 GeolocationDispatcherHost::~GeolocationDispatcherHost() {
 }
 
-void GeolocationDispatcherHost::RenderFrameDeleted(
-    RenderFrameHost* render_frame_host) {
-  OnStopUpdating(render_frame_host);
-}
-
-void GeolocationDispatcherHost::RenderViewHostChanged(
-    RenderViewHost* old_host,
-    RenderViewHost* new_host) {
-  updating_frames_.clear();
-  paused_ = false;
-  geolocation_subscription_.reset();
-}
-
 bool GeolocationDispatcherHost::OnMessageReceived(
     const IPC::Message& msg, RenderFrameHost* render_frame_host) {
   bool handled = true;
@@ -113,37 +48,11 @@ bool GeolocationDispatcherHost::OnMessageReceived(
                         OnRequestPermission)
     IPC_MESSAGE_HANDLER(GeolocationHostMsg_CancelPermissionRequest,
                         OnCancelPermissionRequest)
-    IPC_MESSAGE_HANDLER(GeolocationHostMsg_StartUpdating, OnStartUpdating)
-    IPC_MESSAGE_HANDLER(GeolocationHostMsg_StopUpdating, OnStopUpdating)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
-void GeolocationDispatcherHost::OnLocationUpdate(
-    const Geoposition& geoposition) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-
-  RecordGeopositionErrorCode(geoposition.error_code);
-  if (paused_)
-    return;
-
-  for (std::map<RenderFrameHost*, bool>::iterator i = updating_frames_.begin();
-       i != updating_frames_.end(); ++i) {
-    RenderFrameHost* top_frame = i->first;
-    while (top_frame->GetParent()) {
-      top_frame = top_frame->GetParent();
-    }
-    GetContentClient()->browser()->DidUseGeolocationPermission(
-        web_contents(),
-        i->first->GetLastCommittedURL().GetOrigin(),
-        top_frame->GetLastCommittedURL().GetOrigin());
-
-    i->first->Send(new GeolocationMsg_PositionUpdated(
-        i->first->GetRoutingID(), geoposition));
-  }
-}
-
 void GeolocationDispatcherHost::OnRequestPermission(
     RenderFrameHost* render_frame_host,
     int bridge_id,
@@ -185,55 +94,6 @@ void GeolocationDispatcherHost::OnCancelPermissionRequest(
   }
 }
 
-void GeolocationDispatcherHost::OnStartUpdating(
-    RenderFrameHost* render_frame_host,
-    const GURL& requesting_frame,
-    bool enable_high_accuracy) {
-  // StartUpdating() can be invoked as a result of high-accuracy mode
-  // being enabled / disabled. No need to record the dispatcher again.
-  UMA_HISTOGRAM_BOOLEAN(
-      "Geolocation.GeolocationDispatcherHostImpl.EnableHighAccuracy",
-      enable_high_accuracy);
-
-  updating_frames_[render_frame_host] = enable_high_accuracy;
-  RefreshGeolocationOptions();
-}
-
-void GeolocationDispatcherHost::OnStopUpdating(
-    RenderFrameHost* render_frame_host) {
-  updating_frames_.erase(render_frame_host);
-  RefreshGeolocationOptions();
-}
-
-void GeolocationDispatcherHost::PauseOrResume(bool should_pause) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  paused_ = should_pause;
-  RefreshGeolocationOptions();
-}
-
-void GeolocationDispatcherHost::RefreshGeolocationOptions() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-
-  if (updating_frames_.empty() || paused_) {
-    geolocation_subscription_.reset();
-    return;
-  }
-
-  bool high_accuracy = false;
-  for (std::map<RenderFrameHost*, bool>::iterator i =
-            updating_frames_.begin(); i != updating_frames_.end(); ++i) {
-    if (i->second) {
-      high_accuracy = true;

[blundell, 2014/10/07 11:21:05]

Note: I've introduced a behavioral change. Before, if any frame wanted high
accuracy, they all got high accuracy. Now, only frames that request high
accuracy get high accuracy. Is this change OK?

-      break;
-    }
-  }
-  geolocation_subscription_ = GeolocationProvider::GetInstance()->
-      AddLocationUpdateCallback(
-          base::Bind(&GeolocationDispatcherHost::OnLocationUpdate,
-                      base::Unretained(this)),
-          high_accuracy);
-}
-
 void GeolocationDispatcherHost::SendGeolocationPermissionResponse(
     int render_process_id,
     int render_frame_id,