Get the WebGeolocationClient from WebFrameClient instead of WebViewClient.

Source/modules/geolocation/testing/InternalsGeolocation.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 14 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "InternalsGeolocation.h"
 
 #include "core/dom/Document.h"
+#include "core/page/Page.h"
 #include "core/testing/Internals.h"
 #include "modules/geolocation/GeolocationController.h"
 #include "modules/geolocation/GeolocationError.h"
 #include "modules/geolocation/GeolocationPosition.h"
 #include "modules/geolocation/testing/GeolocationClientMock.h"
 #include "wtf/CurrentTime.h"
 
 namespace WebCore {
 
 void InternalsGeolocation::setGeolocationClientMock(Internals&, Document* document)
 {
-    ASSERT(document && document->page());
-    GeolocationController* controller = GeolocationController::from(document->page());
+    ASSERT(document && document->frame());
     GeolocationClientMock* client = new GeolocationClientMock();
-    controller->setClientForTest(client);
-    client->setController(controller);
+
+    for (LocalFrame* childFrame = document->page()->mainFrame(); childFrame; childFrame = childFrame->tree().nextSibling())

[kenrb, 2014/06/04 20:28:49]

This loop looks to be entirely redundant, since childFrame is not referenced in
the body. Is it not supposed to be here, or is the loop body wrong?

+        GeolocationController::from(document->frame())->setClientForTest(client);
 }
 
 void InternalsGeolocation::setGeolocationPosition(Internals&, Document* document, double latitude, double longitude, double accuracy)
 {
-    ASSERT(document && document->page());
+    ASSERT(document && document->frame());
     GeolocationClientMock* client = geolocationClient(document);
     if (!client)
         return;
     client->setPosition(GeolocationPosition::create(currentTime(), latitude, longitude, accuracy));
 }
 
 void InternalsGeolocation::setGeolocationPositionUnavailableError(Internals&, Document* document, const String& message)
 {
-    ASSERT(document && document->page());
+    ASSERT(document && document->frame());
     GeolocationClientMock* client = geolocationClient(document);
     if (!client)
         return;
     client->setPositionUnavailableError(message);
 }
 
 void InternalsGeolocation::setGeolocationPermission(Internals&, Document* document, bool allowed)
 {
-    ASSERT(document && document->page());
+    ASSERT(document && document->frame());
     GeolocationClientMock* client = geolocationClient(document);
     if (!client)
         return;
     client->setPermission(allowed);
 }
 
 int InternalsGeolocation::numberOfPendingGeolocationPermissionRequests(Internals&, Document* document)
 {
-    ASSERT(document && document->page());
+    ASSERT(document && document->frame());
     GeolocationClientMock* client = geolocationClient(document);
     if (!client)
         return -1;
     return client->numberOfPendingPermissionRequests();
 }
 
 GeolocationClientMock* InternalsGeolocation::geolocationClient(Document* document)
 {
-    GeolocationController* controller = GeolocationController::from(document->page());
+    GeolocationController* controller = GeolocationController::from(document->frame());
     if (!controller->hasClientForTest())
         return 0;
     return static_cast<GeolocationClientMock*>(controller->client());
 }
 
 } // namespace WebCore