| Index: chrome_frame/urlmon_url_request.cc
|
| ===================================================================
|
| --- chrome_frame/urlmon_url_request.cc (revision 55540)
|
| +++ chrome_frame/urlmon_url_request.cc (working copy)
|
| @@ -184,7 +184,7 @@
|
|
|
| size_t UrlmonUrlRequest::SendDataToDelegate(size_t bytes_to_read) {
|
| DCHECK_EQ(thread_, PlatformThread::CurrentId());
|
| - DCHECK(id() != -1);
|
| + DCHECK_NE(id(), -1);
|
| DCHECK_GT(bytes_to_read, 0U);
|
| size_t bytes_copied = 0;
|
| if (delegate_) {
|
| @@ -220,7 +220,7 @@
|
|
|
| if (bytes_copied) {
|
| ++calling_delegate_;
|
| - DCHECK(id() != -1);
|
| + DCHECK_NE(id(), -1);
|
| delegate_->OnReadComplete(id(), read_data);
|
| --calling_delegate_;
|
| }
|
| @@ -375,7 +375,7 @@
|
| // TRUE |TRUE => Something went wrong!!
|
|
|
| if (pending_data_) {
|
| - DCHECK(pending_read_size_ == 0);
|
| + DCHECK_EQ(pending_read_size_, 0UL);
|
| ReleaseBindings();
|
| return S_OK;
|
| }
|
| @@ -619,7 +619,7 @@
|
|
|
| // Inform the delegate.
|
| headers_received_ = true;
|
| - DCHECK(id() != -1);
|
| + DCHECK_NE(id(), -1);
|
| delegate_->OnResponseStarted(id(),
|
| "", // mime_type
|
| raw_headers.c_str(), // headers
|
| @@ -908,8 +908,10 @@
|
| DLOG(INFO) << __FUNCTION__ << " id: " << request_id;
|
| DCHECK_EQ(0, calling_delegate_);
|
|
|
| - if (stopping_)
|
| + if (stopping_) {
|
| + DLOG(WARNING) << __FUNCTION__ << " request not started (stopping)";
|
| return;
|
| + }
|
|
|
| DCHECK(request_map_.find(request_id) == request_map_.end());
|
| DCHECK(GURL(request_info.url).is_valid());
|
|
|