Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9)

Unified Diff: Source/modules/geolocation/testing/InternalsGeolocation.cpp

Issue 256843004: Get the WebGeolocationClient from WebFrameClient instead of WebViewClient. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: fix layouttest, fix webkit_unit_tests crash, remove obsolete layout test Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/modules/geolocation/testing/InternalsGeolocation.cpp
diff --git a/Source/modules/geolocation/testing/InternalsGeolocation.cpp b/Source/modules/geolocation/testing/InternalsGeolocation.cpp
index ff1f1b099563782fb9fe48432e63b86895229851..54251dd666054d3bdeda3ec40038b4f6eeb2efd5 100644
--- a/Source/modules/geolocation/testing/InternalsGeolocation.cpp
+++ b/Source/modules/geolocation/testing/InternalsGeolocation.cpp
@@ -43,8 +43,8 @@ namespace WebCore {
void InternalsGeolocation::setGeolocationClientMock(Internals&, Document* document)
{
- ASSERT(document && document->page());
- GeolocationController* controller = GeolocationController::from(document->page());
+ ASSERT(document && document->frame());
+ GeolocationController* controller = GeolocationController::from(document->frame());
GeolocationClientMock* client = new GeolocationClientMock();
controller->setClientForTest(client);
client->setController(controller);
@@ -52,7 +52,7 @@ void InternalsGeolocation::setGeolocationClientMock(Internals&, Document* docume
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;
@@ -61,7 +61,7 @@ void InternalsGeolocation::setGeolocationPosition(Internals&, Document* document
void InternalsGeolocation::setGeolocationPositionUnavailableError(Internals&, Document* document, const String& message)
{
- ASSERT(document && document->page());
+ ASSERT(document && document->frame());
GeolocationClientMock* client = geolocationClient(document);
if (!client)
return;
@@ -70,7 +70,7 @@ void InternalsGeolocation::setGeolocationPositionUnavailableError(Internals&, Do
void InternalsGeolocation::setGeolocationPermission(Internals&, Document* document, bool allowed)
{
- ASSERT(document && document->page());
+ ASSERT(document && document->frame());
GeolocationClientMock* client = geolocationClient(document);
if (!client)
return;
@@ -79,7 +79,7 @@ void InternalsGeolocation::setGeolocationPermission(Internals&, Document* docume
int InternalsGeolocation::numberOfPendingGeolocationPermissionRequests(Internals&, Document* document)
{
- ASSERT(document && document->page());
+ ASSERT(document && document->frame());
GeolocationClientMock* client = geolocationClient(document);
if (!client)
return -1;
@@ -88,7 +88,7 @@ int InternalsGeolocation::numberOfPendingGeolocationPermissionRequests(Internals
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());

Powered by Google App Engine
This is Rietveld 408576698