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

Unified Diff: net/url_request/url_request_http_job.cc

Issue 2315613002: Extracted NetLog class's inner enum types into their own enum classes and (Closed)
Patch Set: Ran "git cl format" on code. Much formatting ensued. Created 4 years, 3 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
« no previous file with comments | « net/url_request/url_request.cc ('k') | net/url_request/url_request_http_job_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 d2a4797bff6a8310d6aede6477d1cf2198a2a28b..7ee8cddc610d583e778bbcdff3de10e740023a50 100644
--- a/net/url_request/url_request_http_job.cc
+++ b/net/url_request/url_request_http_job.cc
@@ -41,6 +41,7 @@
#include "net/http/http_transaction.h"
#include "net/http/http_transaction_factory.h"
#include "net/http/http_util.h"
+#include "net/log/net_log_event_type.h"
#include "net/nqe/network_quality_estimator.h"
#include "net/proxy/proxy_info.h"
#include "net/proxy/proxy_retry_info.h"
@@ -447,7 +448,7 @@ void URLRequestHttpJob::NotifyHeadersComplete() {
if (rv != SDCH_OK) {
SdchManager::SdchErrorRecovery(rv);
request()->net_log().AddEvent(
- NetLog::TYPE_SDCH_DECODING_ERROR,
+ NetLogEventType::SDCH_DECODING_ERROR,
base::Bind(&NetLogSdchResourceProblemCallback, rv));
} else {
const std::string name = "Get-Dictionary";
@@ -472,7 +473,7 @@ void URLRequestHttpJob::NotifyHeadersComplete() {
if (rv != SDCH_OK) {
SdchManager::SdchErrorRecovery(rv);
request_->net_log().AddEvent(
- NetLog::TYPE_SDCH_DICTIONARY_ERROR,
+ NetLogEventType::SDCH_DICTIONARY_ERROR,
base::Bind(&NetLogSdchDictionaryFetchProblemCallback, rv,
sdch_dictionary_url, false));
}
@@ -568,7 +569,7 @@ void URLRequestHttpJob::MaybeStartTransactionInternal(int result) {
StartTransactionInternal();
} else {
std::string source("delegate");
- request_->net_log().AddEvent(NetLog::TYPE_CANCELLED,
+ request_->net_log().AddEvent(NetLogEventType::CANCELLED,
NetLog::StringCallback("source", &source));
NotifyStartError(URLRequestStatus(URLRequestStatus::FAILED, result));
}
@@ -666,7 +667,7 @@ void URLRequestHttpJob::AddExtraHeaders() {
advertise_sdch = false;
SdchManager::SdchErrorRecovery(rv);
request()->net_log().AddEvent(
- NetLog::TYPE_SDCH_DECODING_ERROR,
+ NetLogEventType::SDCH_DECODING_ERROR,
base::Bind(&NetLogSdchResourceProblemCallback, rv));
}
}
@@ -819,7 +820,7 @@ void URLRequestHttpJob::SaveCookiesAndNotifyHeadersComplete(int result) {
if (result != OK) {
std::string source("delegate");
- request_->net_log().AddEvent(NetLog::TYPE_CANCELLED,
+ request_->net_log().AddEvent(NetLogEventType::CANCELLED,
NetLog::StringCallback("source", &source));
NotifyStartError(URLRequestStatus(URLRequestStatus::FAILED, result));
return;
@@ -993,9 +994,9 @@ void URLRequestHttpJob::OnStartCompleted(int result) {
awaiting_callback_ = true;
} else {
std::string source("delegate");
- request_->net_log().AddEvent(NetLog::TYPE_CANCELLED,
- NetLog::StringCallback("source",
- &source));
+ request_->net_log().AddEvent(
+ NetLogEventType::CANCELLED,
+ NetLog::StringCallback("source", &source));
OnCallToDelegateComplete();
NotifyStartError(URLRequestStatus(URLRequestStatus::FAILED, error));
}
« no previous file with comments | « net/url_request/url_request.cc ('k') | net/url_request/url_request_http_job_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698