Get the WebGeolocationClient from WebFrameClient instead of WebViewClient.

Source/modules/geolocation/GeolocationInspectorAgent.cpp

 /*
  * Copyright (C) 2014 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 17 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "modules/geolocation/GeolocationInspectorAgent.h"
 
 #include "modules/geolocation/GeolocationController.h"
 
 namespace WebCore {
 
-PassOwnPtr<GeolocationInspectorAgent> GeolocationInspectorAgent::create(GeolocationController* controller)
+PassOwnPtr<GeolocationInspectorAgent> GeolocationInspectorAgent::create()
 {
-    return adoptPtr(new GeolocationInspectorAgent(controller));
+    return adoptPtr(new GeolocationInspectorAgent());
 }
 
 GeolocationInspectorAgent::~GeolocationInspectorAgent()
 {
 }
 
-GeolocationInspectorAgent::GeolocationInspectorAgent(GeolocationController* controller)
+GeolocationInspectorAgent::GeolocationInspectorAgent()
     : InspectorBaseAgent<GeolocationInspectorAgent>("Geolocation")
-    , m_controller(controller)
     , m_geolocationOverridden(false)
 {
 }
 
 void GeolocationInspectorAgent::setGeolocationOverride(ErrorString* error, const double* latitude, const double* longitude, const double* accuracy)
 {
-    GeolocationPosition* position = m_controller->lastPosition();
+    GeolocationPosition* position = (*m_controllers.begin())->lastPosition();
     if (!m_geolocationOverridden && position)
         m_platformGeolocationPosition = position;
 
     m_geolocationOverridden = true;
     if (latitude && longitude && accuracy)
         m_geolocationPosition = GeolocationPosition::create(currentTime(), *latitude, *longitude, *accuracy);
     else
         m_geolocationPosition.clear();
 
-    m_controller->positionChanged(0); // Kick location update.
+    for (WTF::HashSet<GeolocationController*>::iterator it = m_controllers.begin(); it != m_controllers.end(); ++it)
+        (*it)->positionChanged(0); // Kick location update.
 }
 
 void GeolocationInspectorAgent::clearGeolocationOverride(ErrorString*)
 {
     if (!m_geolocationOverridden)
         return;
     m_geolocationOverridden = false;
     m_geolocationPosition.clear();
 
-    if (m_platformGeolocationPosition.get())
-        m_controller->positionChanged(m_platformGeolocationPosition.get());
+    if (m_platformGeolocationPosition.get()) {
+        for (WTF::HashSet<GeolocationController*>::iterator it = m_controllers.begin(); it != m_controllers.end(); ++it)
+            (*it)->positionChanged(m_platformGeolocationPosition.get());
+    }
 }
 
 GeolocationPosition* GeolocationInspectorAgent::overrideGeolocationPosition(GeolocationPosition* position)
 {
     if (m_geolocationOverridden) {
         if (position)
             m_platformGeolocationPosition = position;
         return m_geolocationPosition.get();
     }
     return position;
 }
 
+void GeolocationInspectorAgent::AddController(GeolocationController* controller)
+{
+    m_controllers.add(controller);
+}
+
+void GeolocationInspectorAgent::RemoveController(GeolocationController* controller)
+{
+    m_controllers.remove(controller);
+}
+
 } // namespace WebCore