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

Unified Diff: webrtc/base/httpclient.cc

Issue 2620303003: Replace ASSERT by RTC_DCHECK in all non-test code. (Closed)
Patch Set: Address final nits. Created 3 years, 11 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 | « webrtc/base/httpclient.h ('k') | webrtc/base/httpcommon.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/base/httpclient.cc
diff --git a/webrtc/base/httpclient.cc b/webrtc/base/httpclient.cc
index 63e5bb2703aaebb799daf5a3d52843567820b488..e65eb9e80c4f05db2f500d91a923f7bee8669d34 100644
--- a/webrtc/base/httpclient.cc
+++ b/webrtc/base/httpclient.cc
@@ -37,7 +37,7 @@ const size_t kCacheBody = 1;
// Convert decimal string to integer
bool HttpStringToUInt(const std::string& str, size_t* val) {
- ASSERT(NULL != val);
+ RTC_DCHECK(NULL != val);
char* eos = NULL;
*val = strtoul(str.c_str(), &eos, 10);
return (*eos == '\0');
@@ -341,7 +341,7 @@ void HttpClient::start() {
return;
}
- ASSERT(!IsCacheActive());
+ RTC_DCHECK(!IsCacheActive());
if (request().hasHeader(HH_TRANSFER_ENCODING, NULL)) {
// Exact size must be known on the client. Instead of using chunked
@@ -403,7 +403,7 @@ void HttpClient::connect() {
}
StreamInterface* stream = pool_->RequestConnectedStream(server_, &stream_err);
if (stream == NULL) {
- ASSERT(0 != stream_err);
+ RTC_DCHECK(0 != stream_err);
LOG(LS_ERROR) << "RequestConnectedStream error: " << stream_err;
onHttpComplete(HM_CONNECT, HE_CONNECT_FAILED);
} else {
@@ -453,8 +453,8 @@ bool HttpClient::ShouldRedirect(std::string* location) const {
}
bool HttpClient::BeginCacheFile() {
- ASSERT(NULL != cache_);
- ASSERT(CS_READY == cache_state_);
+ RTC_DCHECK(NULL != cache_);
+ RTC_DCHECK(CS_READY == cache_state_);
std::string id = GetCacheID(request());
CacheLock lock(cache_, id, true);
@@ -520,8 +520,8 @@ void HttpClient::CompleteCacheFile() {
}
bool HttpClient::CheckCache() {
- ASSERT(NULL != cache_);
- ASSERT(CS_READY == cache_state_);
+ RTC_DCHECK(NULL != cache_);
+ RTC_DCHECK(CS_READY == cache_state_);
std::string id = GetCacheID(request());
if (!cache_->HasResource(id)) {
@@ -615,7 +615,7 @@ HttpError HttpClient::ReadCacheBody(const std::string& id) {
}
bool HttpClient::PrepareValidate() {
- ASSERT(CS_READY == cache_state_);
+ RTC_DCHECK(CS_READY == cache_state_);
// At this point, request() contains the pending request, and response()
// contains the cached response headers. Reformat the request to validate
// the cached content.
@@ -637,7 +637,7 @@ bool HttpClient::PrepareValidate() {
}
HttpError HttpClient::CompleteValidate() {
- ASSERT(CS_VALIDATING == cache_state_);
+ RTC_DCHECK(CS_VALIDATING == cache_state_);
std::string id = GetCacheID(request());
@@ -686,7 +686,7 @@ HttpError HttpClient::onHttpHeaderComplete(bool chunked, size_t& data_size) {
// Continue processing response as normal
}
- ASSERT(!IsCacheActive());
+ RTC_DCHECK(!IsCacheActive());
if ((request().verb == HV_HEAD) || !HttpCodeHasBody(response().scode)) {
// HEAD requests and certain response codes contain no body
data_size = 0;
@@ -757,7 +757,7 @@ void HttpClient::onHttpComplete(HttpMode mode, HttpError err) {
request().document.reset();
} else if (request().document && !request().document->Rewind()) {
// Unable to replay the request document.
- ASSERT(REDIRECT_ALWAYS == redirect_action_);
+ RTC_DCHECK(REDIRECT_ALWAYS == redirect_action_);
err = HE_STREAM;
}
if (err == HE_NONE) {
« no previous file with comments | « webrtc/base/httpclient.h ('k') | webrtc/base/httpcommon.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698