diff options
author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-06 17:34:33 +0000 |
---|---|---|
committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-06 17:34:33 +0000 |
commit | 2d5a364167c29174b46fac39b9fb29a56308a4bf (patch) | |
tree | 9eb022a1f513fdd68a16c131414c1a00cabf102a /chrome | |
parent | 8fea4ef2fa1b6ebaf54d9f5ccc71ea6380596c45 (diff) | |
download | chromium_src-2d5a364167c29174b46fac39b9fb29a56308a4bf.zip chromium_src-2d5a364167c29174b46fac39b9fb29a56308a4bf.tar.gz chromium_src-2d5a364167c29174b46fac39b9fb29a56308a4bf.tar.bz2 |
Revert r19950 since it broke vista tests.
Revert "Add checks to track down crashes in URLRequestChromeJob."
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/155092
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19957 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r-- | chrome/browser/dom_ui/chrome_url_data_manager.cc | 13 | ||||
-rw-r--r-- | chrome/browser/dom_ui/chrome_url_data_manager.h | 5 |
2 files changed, 0 insertions, 18 deletions
diff --git a/chrome/browser/dom_ui/chrome_url_data_manager.cc b/chrome/browser/dom_ui/chrome_url_data_manager.cc index 2537a12..ff4fa9f 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. diff --git a/chrome/browser/dom_ui/chrome_url_data_manager.h b/chrome/browser/dom_ui/chrome_url_data_manager.h index 49e8fd1..f11045c 100644 --- a/chrome/browser/dom_ui/chrome_url_data_manager.h +++ b/chrome/browser/dom_ui/chrome_url_data_manager.h @@ -112,11 +112,6 @@ private: // Remove a request from the list of pending requests. void RemoveRequest(URLRequestChromeJob* job); - // Returns true if the job exists in |pending_requests_|. False otherwise. - // Called by ~URLRequestChromeJob to verify that |pending_requests_| is kept - // up to date. - bool HasPendingJob(URLRequestChromeJob* job) const; - // Sent by Request::SendResponse. void DataAvailable(RequestID request_id, scoped_refptr<RefCountedBytes> bytes); |