Stop using [Client=...] feature of Mojom for GeolocationService

content/renderer/geolocation_dispatcher.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/geolocation_dispatcher.h"
 
 #include "content/child/child_thread.h"
 #include "content/public/common/geoposition.h"
 #include "content/renderer/render_view_impl.h"
 #include "third_party/WebKit/public/platform/WebString.h"
@@ skipping 14 matching lines @@
 
 GeolocationDispatcher::GeolocationDispatcher(RenderFrame* render_frame)
     : RenderFrameObserver(render_frame),
       pending_permissions_(new WebGeolocationPermissionRequestManager()),
       enable_high_accuracy_(false) {
 }
 
 GeolocationDispatcher::~GeolocationDispatcher() {}
 
 void GeolocationDispatcher::startUpdating() {
-  if (!geolocation_service_.get()) {
+  if (!geolocation_service_) {
     render_frame()->GetServiceRegistry()->ConnectToRemoteService(
         &geolocation_service_);
-    geolocation_service_.set_client(this);
   }
   if (enable_high_accuracy_)
     geolocation_service_->SetHighAccuracy(true);
+  QueryNextPosition();
 }
 
 void GeolocationDispatcher::stopUpdating() {
   geolocation_service_.reset();
 }
 
 void GeolocationDispatcher::setEnableHighAccuracy(bool enable_high_accuracy) {
   // GeolocationController calls setEnableHighAccuracy(true) before
   // startUpdating in response to the first high-accuracy Geolocation
   // subscription. When the last high-accuracy Geolocation unsubscribes
   // it calls setEnableHighAccuracy(false) after stopUpdating.
   bool has_changed = enable_high_accuracy_ != enable_high_accuracy;
   enable_high_accuracy_ = enable_high_accuracy;
   // We have a different accuracy requirement. Request browser to update.
-  if (geolocation_service_.get() && has_changed)
+  if (geolocation_service_ && has_changed)
     geolocation_service_->SetHighAccuracy(enable_high_accuracy_);
 }
 
 void GeolocationDispatcher::setController(
     WebGeolocationController* controller) {
   controller_.reset(controller);
 }
 
 bool GeolocationDispatcher::lastPosition(WebGeolocationPosition&) {
   // The latest position is stored in the browser, not the renderer, so we
@@ skipping 33 matching lines @@
 void GeolocationDispatcher::OnPermissionSet(
     int permission_request_id,
     PermissionStatus status) {
   WebGeolocationPermissionRequest permissionRequest;
   if (!pending_permissions_->remove(permission_request_id, permissionRequest))
     return;
 
   permissionRequest.setIsAllowed(status == PERMISSION_STATUS_GRANTED);
 }
 
-void GeolocationDispatcher::OnLocationUpdate(MojoGeopositionPtr geoposition) {
-  DCHECK(geolocation_service_.get());
+void GeolocationDispatcher::QueryNextPosition() {
+  DCHECK(geolocation_service_);
+  geolocation_service_->QueryNextPosition(
+      base::Bind(&GeolocationDispatcher::OnPositionUpdate,
+                 base::Unretained(this)));
+}
+
+void GeolocationDispatcher::OnPositionUpdate(MojoGeopositionPtr geoposition) {
+  QueryNextPosition();

[blundell, 2015/01/09 07:37:26]

Nit: I think the code would be more clear by putting QueryNextPosition() at the
end of this function...logically the client is processing the current update and
then asking for the next update, even if physically there isn't an ordering
requirement between the two tasks.

 
   if (geoposition->valid) {
     controller_->positionChanged(WebGeolocationPosition(
         geoposition->timestamp,
         geoposition->latitude,
         geoposition->longitude,
         geoposition->accuracy,
         // Lowest point on land is at approximately -400 meters.
             geoposition->altitude > -10000.,
         geoposition->altitude,
@@ skipping 15 matching lines @@
       default:
         NOTREACHED() << geoposition->error_code;
         return;
     }
     controller_->errorOccurred(WebGeolocationError(
         code, blink::WebString::fromUTF8(geoposition->error_message)));
   }
 }
 
 }  // namespace content