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

Unified Diff: net/url_request/url_request_http_job.cc

Issue 1291673003: SdchManager: remove EnableSdchSupport (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Delete obsolete test Created 5 years, 4 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/url_request/url_request_http_job.cc
diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
index 0a6632e08b5fb0da630f0a9287b9460cb314d7bb..c9aa4cc2ed326c6518658e1a01917401f97711cf 100644
--- a/net/url_request/url_request_http_job.cc
+++ b/net/url_request/url_request_http_job.cc
@@ -344,13 +344,10 @@ void URLRequestHttpJob::NotifyHeadersComplete() {
if (sdch_manager) {
SdchProblemCode rv = sdch_manager->IsInSupportedDomain(request()->url());
if (rv != SDCH_OK) {
- // If SDCH is just disabled, it is not a real error.
- if (rv != SDCH_DISABLED) {
- SdchManager::SdchErrorRecovery(rv);
- request()->net_log().AddEvent(
- NetLog::TYPE_SDCH_DECODING_ERROR,
- base::Bind(&NetLogSdchResourceProblemCallback, rv));
- }
+ SdchManager::SdchErrorRecovery(rv);
+ request()->net_log().AddEvent(
+ NetLog::TYPE_SDCH_DECODING_ERROR,
+ base::Bind(&NetLogSdchResourceProblemCallback, rv));
} else {
const std::string name = "Get-Dictionary";
std::string url_text;
@@ -559,13 +556,10 @@ void URLRequestHttpJob::AddExtraHeaders() {
SdchProblemCode rv = sdch_manager->IsInSupportedDomain(request()->url());
if (rv != SDCH_OK) {
advertise_sdch = false;
- // If SDCH is just disabled, it is not a real error.
- if (rv != SDCH_DISABLED) {
- SdchManager::SdchErrorRecovery(rv);
- request()->net_log().AddEvent(
- NetLog::TYPE_SDCH_DECODING_ERROR,
- base::Bind(&NetLogSdchResourceProblemCallback, rv));
- }
+ SdchManager::SdchErrorRecovery(rv);
+ request()->net_log().AddEvent(
+ NetLog::TYPE_SDCH_DECODING_ERROR,
+ base::Bind(&NetLogSdchResourceProblemCallback, rv));
}
}
if (advertise_sdch) {

Powered by Google App Engine
This is Rietveld 408576698