Clean registering mixed content restricting schemes

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

 /*
  * Copyright (C) 2010 Apple Inc. All Rights Reserved.
  *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 42 matching lines @@
     localSchemes.add("file");
 
   return localSchemes;
 }
 
 static URLSchemesSet& displayIsolatedURLSchemes() {
   DEFINE_STATIC_LOCAL_WITH_LOCK(URLSchemesSet, displayIsolatedSchemes, ());
   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,
                                 ({
                                     "https", "about", "data", "wss",
                                 }));
   return secureSchemes;
 }
 
 static URLSchemesSet& schemesWithUniqueOrigins() {
   DEFINE_STATIC_LOCAL_WITH_LOCK(URLSchemesSet, schemesWithUniqueOrigins,
@@ skipping 135 matching lines @@
 
 bool SchemeRegistry::shouldTreatURLSchemeAsDisplayIsolated(
     const String& scheme) {
   DCHECK_EQ(scheme, scheme.lower());
   if (scheme.isEmpty())
     return false;
   MutexLocker locker(mutex());
   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) {
   DCHECK_EQ(scheme, scheme.lower());
   MutexLocker locker(mutex());
   secureSchemes().add(scheme);
 }
 
 bool SchemeRegistry::shouldTreatURLSchemeAsSecure(const String& scheme) {
   DCHECK_EQ(scheme, scheme.lower());
@@ skipping 212 matching lines @@
 
 bool SchemeRegistry::schemeShouldBypassSecureContextCheck(
     const String& scheme) {
   if (scheme.isEmpty())
     return false;
   MutexLocker locker(mutex());
   return secureContextBypassingSchemes().contains(scheme.lower());
 }
 
 }  // namespace blink