Add mojo::StrongBindingSet and use it in GeolocationServiceContext.

content/browser/devtools/protocol/emulation_handler.cc

 // Copyright 2015 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/browser/devtools/protocol/emulation_handler.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/browser/geolocation/geolocation_service_context.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/view_messages.h"
+#include "content/public/common/geoposition.h"
 #include "content/public/common/url_constants.h"
 
 namespace content {
 namespace devtools {
 namespace emulation {
 
 using Response = DevToolsProtocolClient::Response;
 
 namespace {
 
@@ skipping 45 matching lines @@
   UpdateTouchEventEmulationState();
   UpdateDeviceEmulationState();
 }
 
 Response EmulationHandler::SetGeolocationOverride(
     double* latitude, double* longitude, double* accuracy) {
   if (!GetWebContents())
     return Response::InternalError("Could not connect to view");
 
   GeolocationServiceContext* geolocation_context =
-      GetWebContents()->GetGeolocationServiceContext();
+      GeolocationServiceContext::GetOrCreateForWebContents(GetWebContents());
   scoped_ptr<Geoposition> geoposition(new Geoposition());
   if (latitude && longitude && accuracy) {
     geoposition->latitude = *latitude;
     geoposition->longitude = *longitude;
     geoposition->accuracy = *accuracy;
     geoposition->timestamp = base::Time::Now();
     if (!geoposition->Validate()) {
       return Response::InternalError("Invalid geolocation");
     }
   } else {
     geoposition->error_code = Geoposition::ERROR_CODE_POSITION_UNAVAILABLE;
   }
   geolocation_context->SetOverride(geoposition.Pass());
   return Response::OK();
 }
 
 Response EmulationHandler::ClearGeolocationOverride() {
   if (!GetWebContents())
     return Response::InternalError("Could not connect to view");
 
   GeolocationServiceContext* geolocation_context =
-      GetWebContents()->GetGeolocationServiceContext();
-  geolocation_context->ClearOverride();
+      GeolocationServiceContext::FromWebContents(GetWebContents());
+  if (geolocation_context)
+    geolocation_context->ClearOverride();
   return Response::OK();

[Michael van Ouwerkerk, 2015/11/11 11:20:56]

Should this return OK if !geolocation_context ?

[Sam McNally, 2015/11/13 00:49:59]

Yes. If an EmulationHandler tries to clear the override without either there
being a service created or an override set, then this should be a no-op, so OK
is correct.

 }
 
 Response EmulationHandler::SetTouchEmulationEnabled(
     bool enabled, const std::string* configuration) {
   touch_emulation_enabled_ = enabled;
   touch_emulation_configuration_ =
       configuration ? *configuration : std::string();
   UpdateTouchEventEmulationState();
   return Response::FallThrough();
 }
@@ skipping 122 matching lines @@
         widget_host->GetRoutingID(), device_emulation_params_));
   } else {
     widget_host->Send(new ViewMsg_DisableDeviceEmulation(
         widget_host->GetRoutingID()));
   }
 }
 
 }  // namespace emulation
 }  // namespace devtools
 }  // namespace content