Clean registering mixed content restricting schemes

This API is unused, so there is no need for a thread safe map, or even
a scheme map at all.

BUG=348655

Review-Url: https://codereview.chromium.org/2475673003
Cr-Commit-Position: refs/heads/master@{#430280}

third_party/WebKit/Source/platform/weborigin/SchemeRegistry.cpp

@@ -60,14 +60,6 @@ static URLSchemesSet& displayIsolatedURLSchemes() {
   return displayIsolatedSchemes;
 }
 
-static URLSchemesSet& mixedContentRestrictingSchemes() {
-  DEFINE_STATIC_LOCAL_WITH_LOCK(URLSchemesSet, mixedContentRestrictingSchemes,
-                                ({
-                                    "https",
-                                }));
-  return mixedContentRestrictingSchemes;
-}
-
 static URLSchemesSet& secureSchemes() {
   DEFINE_STATIC_LOCAL_WITH_LOCK(URLSchemesSet, secureSchemes,
                                 ({
@@ -223,20 +215,10 @@ bool SchemeRegistry::shouldTreatURLSchemeAsDisplayIsolated(
   return displayIsolatedURLSchemes().contains(scheme);
 }
 
-void SchemeRegistry::registerURLSchemeAsRestrictingMixedContent(
-    const String& scheme) {
-  DCHECK_EQ(scheme, scheme.lower());
-  MutexLocker locker(mutex());
-  mixedContentRestrictingSchemes().add(scheme);
-}
-
 bool SchemeRegistry::shouldTreatURLSchemeAsRestrictingMixedContent(
     const String& scheme) {
   DCHECK_EQ(scheme, scheme.lower());
-  if (scheme.isEmpty())
-    return false;
-  MutexLocker locker(mutex());
-  return mixedContentRestrictingSchemes().contains(scheme);
+  return scheme == "https";
 }
 
 void SchemeRegistry::registerURLSchemeAsSecure(const String& scheme) {

third_party/WebKit/Source/platform/weborigin/SchemeRegistry.h

@@ -50,7 +50,6 @@ class PLATFORM_EXPORT SchemeRegistry {
   static void registerURLSchemeAsLocal(const String&);
   static bool shouldTreatURLSchemeAsLocal(const String&);
 
-  static void registerURLSchemeAsRestrictingMixedContent(const String&);
   static bool shouldTreatURLSchemeAsRestrictingMixedContent(const String&);
 
   // Subresources transported by secure schemes do not trigger mixed content

third_party/WebKit/Source/web/WebSecurityPolicy.cpp

@@ -53,19 +53,10 @@ void WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(
   SchemeRegistry::registerURLSchemeAsDisplayIsolated(scheme);
 }
 
-void WebSecurityPolicy::registerURLSchemeAsRestrictingMixedContent(
-    const WebString& scheme) {
-  SchemeRegistry::registerURLSchemeAsRestrictingMixedContent(scheme);
-}
-
 void WebSecurityPolicy::registerURLSchemeAsSecure(const WebString& scheme) {
   SchemeRegistry::registerURLSchemeAsSecure(scheme);
 }
 
-bool WebSecurityPolicy::shouldTreatURLSchemeAsSecure(const WebString& scheme) {
-  return SchemeRegistry::shouldTreatURLSchemeAsSecure(scheme);
-}
-
 void WebSecurityPolicy::registerURLSchemeAsCORSEnabled(
     const WebString& scheme) {
   SchemeRegistry::registerURLSchemeAsCORSEnabled(scheme);

third_party/WebKit/public/web/WebSecurityPolicy.h

@@ -58,19 +58,11 @@ class WebSecurityPolicy {
   // hyperlinks to URLs with the scheme.
   BLINK_EXPORT static void registerURLSchemeAsDisplayIsolated(const WebString&);
 
-  // Registers a URL scheme to generate mixed content warnings when resources
-  // whose schemes are not registered as "secure" are embedded.
-  BLINK_EXPORT static void registerURLSchemeAsRestrictingMixedContent(
-      const WebString&);
-
   // Subresources transported by secure schemes do not trigger mixed content
   // warnings. For example, https and data are secure schemes because they
   // cannot be corrupted by active network attackers.
   BLINK_EXPORT static void registerURLSchemeAsSecure(const WebString&);
 
-  // Returns true if the scheme has been registered as a secure scheme.
-  BLINK_EXPORT static bool shouldTreatURLSchemeAsSecure(const WebString&);
-
   // Registers a non-HTTP URL scheme which can be sent CORS requests.
   BLINK_EXPORT static void registerURLSchemeAsCORSEnabled(const WebString&);