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

Unified Diff: chrome/browser/dom_ui/chrome_url_data_manager.cc

Issue 155092: Revert r19950 since it broke vista tests. (Closed)
Patch Set: Created 11 years, 5 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 | « chrome/browser/dom_ui/chrome_url_data_manager.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/dom_ui/chrome_url_data_manager.cc
diff --git a/chrome/browser/dom_ui/chrome_url_data_manager.cc b/chrome/browser/dom_ui/chrome_url_data_manager.cc
index 2537a127be576e41eb97ccbf81fea4ee227ea1a3..ff4fa9f9954e46d8a8f4c661efd8a14ece6917e5 100644
--- a/chrome/browser/dom_ui/chrome_url_data_manager.cc
+++ b/chrome/browser/dom_ui/chrome_url_data_manager.cc
@@ -199,16 +199,6 @@ void ChromeURLDataManager::RemoveFileSource(const std::string& source_name) {
file_sources_.erase(source_name);
}
-bool ChromeURLDataManager::HasPendingJob(URLRequestChromeJob* job) const {
- for (PendingRequestMap::const_iterator i = pending_requests_.begin();
- i != pending_requests_.end(); ++i) {
- if (i->second == job)
- return true;
- }
-
- return false;
-}
-
bool ChromeURLDataManager::StartRequest(const GURL& url,
URLRequestChromeJob* job) {
// Parse the URL into a request for a source and path.
@@ -303,7 +293,6 @@ URLRequestChromeJob::URLRequestChromeJob(URLRequest* request)
: URLRequestJob(request), data_offset_(0) {}
URLRequestChromeJob::~URLRequestChromeJob() {
- CHECK(!chrome_url_data_manager.HasPendingJob(this));
}
void URLRequestChromeJob::Start() {
@@ -331,7 +320,6 @@ void URLRequestChromeJob::DataAvailable(RefCountedBytes* bytes) {
data_ = bytes;
int bytes_read;
if (pending_buf_.get()) {
- CHECK(pending_buf_->data());
CompleteRead(pending_buf_, pending_buf_size_, &bytes_read);
pending_buf_ = NULL;
NotifyReadComplete(bytes_read);
@@ -347,7 +335,6 @@ bool URLRequestChromeJob::ReadRawData(net::IOBuffer* buf, int buf_size,
if (!data_.get()) {
SetStatus(URLRequestStatus(URLRequestStatus::IO_PENDING, 0));
DCHECK(!pending_buf_.get());
- CHECK(buf->data());
pending_buf_ = buf;
pending_buf_size_ = buf_size;
return false; // Tell the caller we're still waiting for data.
« no previous file with comments | « chrome/browser/dom_ui/chrome_url_data_manager.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698