Index: net/base/sdch_manager.cc |
diff --git a/net/base/sdch_manager.cc b/net/base/sdch_manager.cc |
index c43c8b08c955afa6c441ce5ffbf89408e074abd0..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()) |
asanka
2015/05/11 22:00:46
This is a bit confusing, but the intent here appea
lgarron
2015/05/11 23:23:47
I started splitting this into a separate CL, but I
Randy Smith (Not in Mondays)
2015/05/12 14:08:04
Yes, that's the intent. I'm not sure the conditio
Elly Fong-Jones
2015/05/12 15:26:31
I would drop support for disabling SDCH for secure
asanka
2015/05/12 17:00:17
I'd wait till rdsmith confirms whether the suggest
asanka
2015/05/12 17:00:17
ellyjones, rdsmith: Cool. Thanks for confirming!
|
return SDCH_SECURE_SCHEME_NOT_SUPPORTED; |
if (blacklisted_domains_.empty()) |
@@ -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; |
@@ -299,7 +299,7 @@ SdchManager::GetDictionarySetByHash( |
return result.Pass(); |
if (!SdchManager::secure_scheme_supported() && |
- target_url.SchemeIsSecure()) { |
+ target_url.SchemeIsCryptographic()) { |
*problem_code = SDCH_DICTIONARY_FOUND_HAS_WRONG_SCHEME; |
return result.Pass(); |
} |