Removal of geolocation APIs on insecure origins

third_party/WebKit/Source/modules/geolocation/Geolocation.cpp

Index: third_party/WebKit/Source/modules/geolocation/Geolocation.cpp
diff --git a/third_party/WebKit/Source/modules/geolocation/Geolocation.cpp b/third_party/WebKit/Source/modules/geolocation/Geolocation.cpp
index 0b107f98e7dd36f0d7e931346efd508ebff063d9..7a07d05914a4e8c44a8e1bf2d6a1c8a5ce16e497 100644
--- a/third_party/WebKit/Source/modules/geolocation/Geolocation.cpp
+++ b/third_party/WebKit/Source/modules/geolocation/Geolocation.cpp
@@ -169,8 +169,6 @@ void Geolocation::getCurrentPosition(PositionCallback* successCallback, Position
     if (!frame())
         return;
 
-    recordOriginTypeAccess();
-
     GeoNotifier* notifier = GeoNotifier::create(this, successCallback, errorCallback, options);
     startRequest(notifier);
 
@@ -182,8 +180,6 @@ int Geolocation::watchPosition(PositionCallback* successCallback, PositionErrorC
     if (!frame())
         return 0;
 
-    recordOriginTypeAccess();
-
     GeoNotifier* notifier = GeoNotifier::create(this, successCallback, errorCallback, options);
     startRequest(notifier);
 
@@ -197,12 +193,11 @@ int Geolocation::watchPosition(PositionCallback* successCallback, PositionErrorC
 
 void Geolocation::startRequest(GeoNotifier *notifier)
 {
-    if (frame()->settings()->strictPowerfulFeatureRestrictions()) {
-        String errorMessage;
-        if (!executionContext()->isSecureContext(errorMessage)) {
-            notifier->setFatalError(PositionError::create(PositionError::POSITION_UNAVAILABLE, errorMessage));
-            return;
-        }
+    recordOriginTypeAccess();
+    String errorMessage;
+    if (!executionContext()->isSecureContext(errorMessage)) {
+        notifier->setFatalError(PositionError::create(PositionError::POSITION_UNAVAILABLE, errorMessage));
+        return;
     }
 
     if (RuntimeEnabledFeatures::restrictIFramePermissionsEnabled()) {