3 files changed, 2 insertions, 43 deletions
diff --git a/chrome/browser/profile_manager.cc b/chrome/browser/profile_manager.cc
index a1231e7..4e59066 100644
--- a/chrome/browser/profile_manager.cc
+++ b/chrome/browser/profile_manager.cc
@@ -205,24 +205,10 @@ void ProfileManager::Observe(
 #endif
 }
 
-#if defined(OS_WIN)
-#pragma optimize("", off)
-#pragma warning(disable:4748)
-#endif
 void ProfileManager::SuspendProfile(Profile* profile) {
-  CHECK(profile);
+  DCHECK(profile);
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
 
-  // TODO(rvargas): remove this after finding the cause for bug 31723.
-  URLRequestJob* job_list[50] = { NULL };
-  int count = 0;
-  for (URLRequestJobTracker::JobIterator i = g_url_request_job_tracker.begin();
-       i != g_url_request_job_tracker.end(); ++i) {
-    if (count < 50)
-      job_list[count] = *i;
-    count++;
-  }
-
   for (URLRequestJobTracker::JobIterator i = g_url_request_job_tracker.begin();
        i != g_url_request_job_tracker.end(); ++i)
     (*i)->Kill();
@@ -230,10 +216,6 @@ void ProfileManager::SuspendProfile(Profile* profile) {
   profile->GetRequestContext()->GetURLRequestContext()->
       http_transaction_factory()->Suspend(true);
 }
-#if defined(OS_WIN)
-#pragma warning(default:4748)
-#pragma optimize("", on)
-#endif
 
 void ProfileManager::ResumeProfile(Profile* profile) {
   DCHECK(profile);
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.