Get the WebGeolocationClient from WebFrameClient instead of WebViewClient.

Source/modules/geolocation/testing/GeolocationClientMock.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  * Copyright (C) 2012 Apple 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.
@@ skipping 21 matching lines @@
 #include "config.h"
 #include "GeolocationClientMock.h"
 
 #include "modules/geolocation/GeolocationController.h"
 #include "modules/geolocation/GeolocationError.h"
 #include "modules/geolocation/GeolocationPosition.h"
 
 namespace WebCore {
 
 GeolocationClientMock::GeolocationClientMock()
-    : m_controller(0)
-    , m_hasError(false)
+    : m_hasError(false)
     , m_controllerTimer(this, &GeolocationClientMock::controllerTimerFired)
     , m_permissionTimer(this, &GeolocationClientMock::permissionTimerFired)
     , m_isActive(false)
     , m_permissionState(PermissionStateUnset)
 {
 }
 
 GeolocationClientMock::~GeolocationClientMock()
 {
     ASSERT(!m_isActive);
 }
 
-void GeolocationClientMock::setController(GeolocationController *controller)
-{
-    ASSERT(controller && !m_controller);
-    m_controller = controller;
-}
-
 void GeolocationClientMock::setPosition(PassRefPtrWillBeRawPtr<GeolocationPosition> position)
 {
     m_lastPosition = position;
     clearError();
     asyncUpdateController();
 }
 
 void GeolocationClientMock::setPositionUnavailableError(const String& errorMessage)
 {
     m_hasError = true;
@@ skipping 21 matching lines @@
 }
 
 void GeolocationClientMock::cancelPermissionRequest(Geolocation* geolocation)
 {
     // Called from Geolocation::disconnectFrame() in response to LocalFrame destruction.
     m_pendingPermissions.remove(geolocation);
     if (m_pendingPermissions.isEmpty() && m_permissionTimer.isActive())
         m_permissionTimer.stop();
 }
 
+void GeolocationClientMock::controllerForTestAdded(GeolocationController* controller)
+{
+    m_controllers.add(controller);
+}
+
+void GeolocationClientMock::controllerForTestRemoved(GeolocationController* controller)
+{
+    m_controllers.remove(controller);
+}
+
 void GeolocationClientMock::asyncUpdatePermission()
 {
     ASSERT(m_permissionState != PermissionStateUnset);
     if (!m_permissionTimer.isActive())
         m_permissionTimer.startOneShot(0, FROM_HERE);
 }
 
 void GeolocationClientMock::permissionTimerFired(Timer<GeolocationClientMock>* timer)
 {
     ASSERT_UNUSED(timer, timer == &m_permissionTimer);
@@ skipping 35 matching lines @@
     // See https://bugs.webkit.org/show_bug.cgi?id=49438
 }
 
 GeolocationPosition* GeolocationClientMock::lastPosition()
 {
     return m_lastPosition.get();
 }
 
 void GeolocationClientMock::asyncUpdateController()
 {
-    ASSERT(m_controller);
     if (m_isActive && !m_controllerTimer.isActive())
         m_controllerTimer.startOneShot(0, FROM_HERE);
 }
 
 void GeolocationClientMock::controllerTimerFired(Timer<GeolocationClientMock>* timer)
 {
     ASSERT_UNUSED(timer, timer == &m_controllerTimer);
-    ASSERT(m_controller);
 
+    // Make a copy of the set of controllers since it might be modified while iterating.
+    HashSet<GeolocationController*> controllers = m_controllers;
     if (m_lastPosition.get()) {
         ASSERT(!m_hasError);
-        m_controller->positionChanged(m_lastPosition.get());
+        for (HashSet<GeolocationController*>::iterator it = controllers.begin(); it != controllers.end(); ++it)
+            (*it)->positionChanged(m_lastPosition.get());
     } else if (m_hasError) {
-        m_controller->errorOccurred(GeolocationError::create(GeolocationError::PositionUnavailable, m_errorMessage).get());
+        for (HashSet<GeolocationController*>::iterator it = controllers.begin(); it != controllers.end(); ++it)
+            (*it)->errorOccurred(GeolocationError::create(GeolocationError::PositionUnavailable, m_errorMessage).get());
     }
 }
 
 void GeolocationClientMock::clearError()
 {
     m_hasError = false;
     m_errorMessage = String();
 }
 
 } // WebCore