Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1665)

Unified Diff: net/base/sdch_manager.cc

Issue 1101173004: Switch remaining functions from SchemeIsSecure() to SchemeIsCryptographic(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/base/sdch_manager.cc
diff --git a/net/base/sdch_manager.cc b/net/base/sdch_manager.cc
index 4bf178269df8dc5992314932373734a5e1e78a35..0b168524610b1d2e3988a8c39321248255725aa9 100644
--- a/net/base/sdch_manager.cc
+++ b/net/base/sdch_manager.cc
@@ -186,7 +186,7 @@ SdchProblemCode SdchManager::IsInSupportedDomain(const GURL& url) {
if (!g_sdch_enabled_ )
return SDCH_DISABLED;
- if (!secure_scheme_supported() && url.SchemeIsSecure())
+ if (!secure_scheme_supported() && url.SchemeIsCryptographic())
return SDCH_SECURE_SCHEME_NOT_SUPPORTED;
if (blacklisted_domains_.empty())
@@ -249,7 +249,7 @@ SdchProblemCode SdchManager::CanFetchDictionary(
referring_url.scheme() != dictionary_url.scheme())
return SDCH_DICTIONARY_LOAD_ATTEMPT_FROM_DIFFERENT_HOST;
- if (!secure_scheme_supported() && referring_url.SchemeIsSecure())
+ if (!secure_scheme_supported() && referring_url.SchemeIsCryptographic())
return SDCH_DICTIONARY_SELECTED_FOR_SSL;
// TODO(jar): Remove this failsafe conservative hack which is more restrictive
@@ -268,7 +268,7 @@ SdchManager::GetDictionarySet(const GURL& target_url) {
int count = 0;
scoped_ptr<SdchManager::DictionarySet> result(new DictionarySet);
for (const auto& entry: dictionaries_) {
- if (!secure_scheme_supported() && target_url.SchemeIsSecure())
+ if (!secure_scheme_supported() && target_url.SchemeIsCryptographic())
continue;
if (entry.second->data.CanUse(target_url) != SDCH_OK)
continue;
@@ -298,7 +298,8 @@ SdchManager::GetDictionarySetByHash(
if (it == dictionaries_.end())
return result.Pass();
- if (!SdchManager::secure_scheme_supported() && target_url.SchemeIsSecure()) {
+ if (!SdchManager::secure_scheme_supported() &&
+ target_url.SchemeIsCryptographic()) {
*problem_code = SDCH_DICTIONARY_FOUND_HAS_WRONG_SCHEME;
return result.Pass();
}

Powered by Google App Engine
This is Rietveld 408576698