Removal of geolocation APIs on insecure origins

third_party/WebKit/Source/core/frame/UseCounter.cpp

Index: third_party/WebKit/Source/core/frame/UseCounter.cpp
diff --git a/third_party/WebKit/Source/core/frame/UseCounter.cpp b/third_party/WebKit/Source/core/frame/UseCounter.cpp
index 640c8109986dde4ea7497ccc85ea1b63d27d5403..17b3d3639ed0415b860fb582d4b585010da66407 100644
--- a/third_party/WebKit/Source/core/frame/UseCounter.cpp
+++ b/third_party/WebKit/Source/core/frame/UseCounter.cpp
@@ -899,7 +899,11 @@ String UseCounter::deprecationMessage(Feature feature)
         return "The deviceorientationabsolute event is deprecated on insecure origins, and support will be removed in the future. You should consider switching your application to a secure origin, such as HTTPS. See https://goo.gl/rStTGz for more details.";
 
     case GeolocationInsecureOrigin:
-        return "getCurrentPosition() and watchPosition() are deprecated on insecure origins, and support will be removed in the future. You should consider switching your application to a secure origin, such as HTTPS. See https://goo.gl/rStTGz for more details.";
+        // TODO(jww): This message should be made less ambigous after WebView
+        // is fixed so geolocation can be removed there. After that, this
+        // should be updated to read similarly to GetUserMediaInsecureOrigin's
+        // message.
+        return "getCurrentPosition() and watchPosition() are deprecated on insecure origins. To use this feature, you should consider switching your application to a secure origin, such as HTTPS. See https://goo.gl/rStTGz for more details.";
 
     case GetUserMediaInsecureOrigin:
         return "getUserMedia() no longer works on insecure origins. To use this feature, you should consider switching your application to a secure origin, such as HTTPS. See https://goo.gl/rStTGz for more details.";