Revert of Removal of geolocation APIs on insecure origins

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

 /*
  * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All Rights Reserved.
  * Copyright (C) 2009 Torch Mobile, Inc.
  * Copyright 2010, The Android Open Source Project
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 151 matching lines @@
         UseCounter::countDeprecation(document, UseCounter::GeolocationInsecureOrigin);
         OriginsUsingFeatures::countAnyWorld(*document, OriginsUsingFeatures::Feature::GeolocationInsecureOrigin);
     }
 }
 
 void Geolocation::getCurrentPosition(PositionCallback* successCallback, PositionErrorCallback* errorCallback, const PositionOptions& options)
 {
     if (!frame())
         return;
 
+    recordOriginTypeAccess();
+
     GeoNotifier* notifier = GeoNotifier::create(this, successCallback, errorCallback, options);
     startRequest(notifier);
 
     m_oneShots.add(notifier);
 }
 
 int Geolocation::watchPosition(PositionCallback* successCallback, PositionErrorCallback* errorCallback, const PositionOptions& options)
 {
     if (!frame())
         return 0;
 
+    recordOriginTypeAccess();
+
     GeoNotifier* notifier = GeoNotifier::create(this, successCallback, errorCallback, options);
     startRequest(notifier);
 
     int watchID;
     // Keep asking for the next id until we're given one that we don't already have.
     do {
         watchID = executionContext()->circularSequentialID();
     } while (!m_watchers.add(watchID, notifier));
     return watchID;
 }
 
 void Geolocation::startRequest(GeoNotifier *notifier)
 {
-    recordOriginTypeAccess();
-    String errorMessage;
-    if (!executionContext()->isSecureContext(errorMessage)) {
-        notifier->setFatalError(PositionError::create(PositionError::POSITION_UNAVAILABLE, errorMessage));
-        return;
+    if (frame()->settings()->strictPowerfulFeatureRestrictions()) {
+        String errorMessage;
+        if (!executionContext()->isSecureContext(errorMessage)) {
+            notifier->setFatalError(PositionError::create(PositionError::POSITION_UNAVAILABLE, errorMessage));
+            return;
+        }
     }
 
     if (RuntimeEnabledFeatures::restrictIFramePermissionsEnabled()) {
         // TODO(keenanb): kill the request if the parent is blocking the requester
         Element* owner = document()->ownerElement();
         if (owner && owner->hasAttribute(HTMLNames::permissionsAttr)) {
             String errorMessage = "A cross-origin iframe needs its permissions attribute properly set in order to use the geolocation API.";
             notifier->setFatalError(PositionError::create(PositionError::POSITION_UNAVAILABLE, errorMessage));
             return;
         }
@@ skipping 335 matching lines @@
                 notifier->startTimer();
             else
                 notifier->setFatalError(PositionError::create(PositionError::POSITION_UNAVAILABLE, failedToStartServiceErrorMessage));
         } else {
             notifier->setFatalError(PositionError::create(PositionError::PERMISSION_DENIED, permissionDeniedErrorMessage));
         }
     }
 }
 
 } // namespace blink