diff options
| author | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-03 23:51:19 +0000 |
|---|---|---|
| committer | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-03 23:51:19 +0000 |
| commit | c6a4eb9dd92e391ea363d0e7d0eee5aad9c7a06a (patch) | |
| tree | fb5b5201a1b3acbfe54501a1802dccfa81555e6b /net | |
| parent | f374cebcff7c63dddbce5b46faac21f2647dbf81 (diff) | |
| download | chromium_src-c6a4eb9dd92e391ea363d0e7d0eee5aad9c7a06a.zip chromium_src-c6a4eb9dd92e391ea363d0e7d0eee5aad9c7a06a.tar.gz chromium_src-c6a4eb9dd92e391ea363d0e7d0eee5aad9c7a06a.tar.bz2 | |
Remove debug info used to diagnose bug 31723.
BUG=31723
TEST=none
Review URL: http://codereview.chromium.org/660431
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40570 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/http/http_cache_transaction.cc | 12 | ||||
| -rw-r--r-- | net/url_request/url_request_http_job.cc | 13 |
2 files changed, 1 insertions, 24 deletions
diff --git a/net/http/http_cache_transaction.cc b/net/http/http_cache_transaction.cc index 5b44a76..332a687 100644 --- a/net/http/http_cache_transaction.cc +++ b/net/http/http_cache_transaction.cc @@ -131,15 +131,7 @@ HttpCache::Transaction::Transaction(HttpCache* cache, bool enable_range_support) Invalid_number_of_validation_headers); } -#if defined(OS_WIN) -#pragma optimize("", off) -#pragma warning(disable:4748) -#endif HttpCache::Transaction::~Transaction() { - // TODO(rvargas): remove this after finding the cause for bug 31723. - char local_obj[sizeof(*this)]; - memcpy(local_obj, this, sizeof(local_obj)); - // We may have to issue another IO, but we should never invoke the callback_ // after this point. callback_ = NULL; @@ -170,10 +162,6 @@ HttpCache::Transaction::~Transaction() { // cache_ pointer to signal that we are dead. See DoCacheReadCompleted. cache_.reset(); } -#if defined(OS_WIN) -#pragma warning(default:4748) -#pragma optimize("", on) -#endif int HttpCache::Transaction::Start(const HttpRequestInfo* request, CompletionCallback* callback, diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc index 1b11817..15dafe6 100644 --- a/net/url_request/url_request_http_job.cc +++ b/net/url_request/url_request_http_job.cc @@ -591,23 +591,12 @@ void URLRequestHttpJob::NotifyHeadersComplete() { URLRequestJob::NotifyHeadersComplete(); } -#if defined(OS_WIN) -#pragma optimize("", off) -#pragma warning(disable:4748) -#endif void URLRequestHttpJob::DestroyTransaction() { - CHECK(transaction_.get()); - // TODO(rvargas): remove this after finding the cause for bug 31723. - char local_obj[sizeof(*this)]; - memcpy(local_obj, this, sizeof(local_obj)); + DCHECK(transaction_.get()); transaction_.reset(); response_info_ = NULL; } -#if defined(OS_WIN) -#pragma warning(default:4748) -#pragma optimize("", on) -#endif void URLRequestHttpJob::StartTransaction() { // NOTE: This method assumes that request_info_ is already setup properly. |