Fix geolocation removal from insecure contexts console message

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/frame/Deprecation.h"
 
 #include "core/dom/Document.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/frame/FrameConsole.h"
 #include "core/frame/FrameHost.h"
@@ skipping 276 matching lines @@
     case UseCounter::DeviceOrientationInsecureOrigin:
         return "The deviceorientation 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 UseCounter::DeviceOrientationAbsoluteInsecureOrigin:
         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 UseCounter::GeolocationInsecureOrigin:
     case UseCounter::GeolocationInsecureOriginIframe:
         // 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

[Rick Byers, 2016/05/02 21:43:40]

Is this TODO still relevant?  I.e. does geolocation actually still work in
WebView?  Can you make it dynamic (or worst case use an #ifdef) for the WebView
case?

[jww, 2016/05/02 21:59:12]

Arg, I totally blanked on that case, and that's why I made the messaging
ambiguous in the first place. Yay for putting in comments that explain things!

Yes, it is still relevant. It's a bit messy because this is defined by a
setting, which we can only get via a Frame, and we don't have one at this point.
I'll brainstorm a solution because, you're right, this message should remain for
WebViews. My immediate thought is to just add a second UseCounter for
GeolocationDeprecatedNotRemovedYet, which seems like a useful counter to have
anyway.

         // 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.";
+        return "getCurrentPosition() and watchPosition() no longer work 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 UseCounter::GetUserMediaInsecureOrigin:
     case UseCounter::GetUserMediaInsecureOriginIframe:
         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.";
 
     case UseCounter::EncryptedMediaInsecureOrigin:
         return "requestMediaKeySystemAccess() is deprecated on insecure origins in the specification. 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 UseCounter::ApplicationCacheManifestSelectInsecureOrigin:
     case UseCounter::ApplicationCacheAPIInsecureOrigin:
@@ skipping 63 matching lines @@
     case UseCounter::V8KeyboardEvent_KeyIdentifier_AttributeGetter:
         return willBeRemoved("'KeyboardEvent.keyIdentifier'", 53, "5316065118650368");
 
     // Features that aren't deprecated don't have a deprecation message.
     default:
         return String();
     }
 }
 
 } // namespace blink