Revert of Add debug information for crbug.com/289715 (patchset #5 id:80001 of...

Revert of Add debug information for crbug.com/289715 (patchset #5 id:80001 of https://codereview.chromium.org/810883007/)

Reason for revert:
Remove debugging information that was collected for crbug.com/289715

Original issue's description:
> Add debug information for crbug.com/289715
>
> Add temporary debugging information to determine whether a callback happens
> after the targeted URLRequestHttpJob was already deleted or whether a callback
> happens after its transaction was deleted.
>
> BUG=289715
>
> Committed: https://crrev.com/aec005dce78bc2c2513f4e49343b8baad751a852
> Cr-Commit-Position: refs/heads/master@{#310822}

TBR=mmenke@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=289715

Review URL: https://codereview.chromium.org/907033002

Cr-Commit-Position: refs/heads/master@{#315298}

net/url_request/url_request_http_job.cc

@@ -9,7 +9,6 @@
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
-#include "base/debug/alias.h"
 #include "base/file_version_info.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/field_trial.h"
@@ -208,18 +207,11 @@ URLRequestHttpJob::URLRequestHttpJob(
                      base::Unretained(this))),
       awaiting_callback_(false),
       http_user_agent_settings_(http_user_agent_settings),
-      transaction_state_(TRANSACTION_WAS_NOT_INITIALIZED),
       weak_factory_(this) {
   URLRequestThrottlerManager* manager = request->context()->throttler_manager();
   if (manager)
     throttling_entry_ = manager->RegisterRequestUrl(request->url());
 
-  // TODO(battre) Remove this overriding once crbug.com/289715 has been
-  // resolved.
-  on_headers_received_callback_ =
-      base::Bind(&URLRequestHttpJob::OnHeadersReceivedCallbackForDebugging,
-                 weak_factory_.GetWeakPtr());
-
   ResetTimer();
 }
 
@@ -415,7 +407,6 @@ void URLRequestHttpJob::DestroyTransaction() {
 
   DoneWithRequest(ABORTED);
   transaction_.reset();
-  transaction_state_ = TRANSACTION_WAS_DESTROYED;
   response_info_ = NULL;
   receive_headers_end_ = base::TimeTicks();
 }
@@ -477,8 +468,6 @@ void URLRequestHttpJob::StartTransactionInternal() {
 
     rv = request_->context()->http_transaction_factory()->CreateTransaction(
         priority_, &transaction_);
-    if (rv == OK)
-      transaction_state_ = TRANSACTION_WAS_INITIALIZED;
 
     if (rv == OK && request_info_.url.SchemeIsWSOrWSS()) {
       base::SupportsUserData::Data* data = request_->GetUserData(
@@ -944,19 +933,6 @@ void URLRequestHttpJob::OnStartCompleted(int result) {
   }
 }
 
-// TODO(battre) Use URLRequestHttpJob::OnHeadersReceivedCallback again, once
-// crbug.com/289715 has been resolved.
-// static
-void URLRequestHttpJob::OnHeadersReceivedCallbackForDebugging(
-    base::WeakPtr<net::URLRequestHttpJob> job,
-    int result) {
-  CHECK(job.get());
-  net::URLRequestHttpJob::TransactionState state = job->transaction_state_;
-  base::debug::Alias(&state);
-  CHECK(job->transaction_.get());
-  job->OnHeadersReceivedCallback(result);
-}
-
 void URLRequestHttpJob::OnHeadersReceivedCallback(int result) {
   awaiting_callback_ = false;
 

net/url_request/url_request_http_job.h

@@ -88,11 +88,6 @@ class NET_EXPORT_PRIVATE URLRequestHttpJob : public URLRequestJob {
   // Processes the Public-Key-Pins header, if one exists.
   void ProcessPublicKeyPinsHeader();
 
-  // TODO(battre) Remove this when crbug.com/289715 is fixed.
-  static void OnHeadersReceivedCallbackForDebugging(
-      base::WeakPtr<URLRequestHttpJob> job,
-      int result);
-
   // |result| should be net::OK, or the request is canceled.
   void OnHeadersReceivedCallback(int result);
   void OnStartCompleted(int result);
@@ -272,14 +267,6 @@ class NET_EXPORT_PRIVATE URLRequestHttpJob : public URLRequestJob {
 
   const HttpUserAgentSettings* http_user_agent_settings_;
 
-  // TODO(battre) Remove this when crbug.com/289715 is fixed.
-  enum TransactionState {
-    TRANSACTION_WAS_NOT_INITIALIZED,
-    TRANSACTION_WAS_INITIALIZED,
-    TRANSACTION_WAS_DESTROYED
-  };
-  TransactionState transaction_state_;
-
   base::WeakPtrFactory<URLRequestHttpJob> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(URLRequestHttpJob);