Remove debugging code for fixed bugs. Also clean up unused includes.

Remove debugging code for fixed bugs. Also clean up unused includes.

BUG=90971, 598073
Committed: https://crrev.com/95ba699eba9413f257437534e9e58dc42bfc82ae
Cr-Commit-Position: refs/heads/master@{#399943}

[jam, 2016-06-14 22:29:23]

Patchset #1 (id:1) has been deleted

[jam, 2016-06-14 22:53:21]

jam@chromium.org changed reviewers:
+ scottmg@chromium.org

[scottmg, 2016-06-14 22:56:48]

lgtm

[jam, 2016-06-15 04:27:10]

The CQ bit was checked by jam@chromium.org

[jam, 2016-06-15 04:27:11]

The patchset sent to the CQ was uploaded after l-g-t-m from scottmg@chromium.org
Link to the patchset: https://codereview.chromium.org/2062263002/#ps30007
(title: "more")

[commit-bot: I haz the power, 2016-06-15 04:27:31]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/2062263002/30007

[commit-bot: I haz the power, 2016-06-15 04:43:22]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-06-15 04:43:24]

Failed to apply patch for content/browser/resource_context_impl.cc:
While running git apply --index -3 -p1;
  error: patch failed: content/browser/resource_context_impl.cc:37
  Falling back to three-way merge...
  Applied patch to 'content/browser/resource_context_impl.cc' with conflicts.
  U content/browser/resource_context_impl.cc

Patch:       content/browser/resource_context_impl.cc
Index: content/browser/resource_context_impl.cc
diff --git a/content/browser/resource_context_impl.cc
b/content/browser/resource_context_impl.cc
index
e7aa29b9570d5706018be8032db33507b15392f9..04dcec987f73d58fac9f61da2de87d0abba2568f
100644
--- a/content/browser/resource_context_impl.cc
+++ b/content/browser/resource_context_impl.cc
@@ -37,23 +37,9 @@ std::string ReturnEmptySalt() {
 
 }  // namespace
 
-
-ResourceContext::ResourceContext() {
-  ResourceDispatcherHostImpl* rdhi = ResourceDispatcherHostImpl::Get();
-  if (rdhi) {
-    BrowserThread::PostTask(
-        BrowserThread::IO, FROM_HERE,
-        base::Bind(&ResourceDispatcherHostImpl::AddResourceContext,
-                   base::Unretained(rdhi), this));
-  }
-}
-
 ResourceContext::~ResourceContext() {
-  ResourceDispatcherHostImpl* rdhi = ResourceDispatcherHostImpl::Get();
-  if (rdhi) {
-    rdhi->CancelRequestsForContext(this);
-    rdhi->RemoveResourceContext(this);
-  }
+  if (ResourceDispatcherHostImpl::Get())
+    ResourceDispatcherHostImpl::Get()->CancelRequestsForContext(this);
 
   // In some tests this object is destructed on UI thread.
   DetachUserDataThread();

[commit-bot: I haz the power, 2016-06-15 04:43:29]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-06-15 04:43:30]

CQ bit was unchecked

[jam, 2016-06-15 15:52:15]

The CQ bit was checked by jam@chromium.org

[jam, 2016-06-15 15:52:16]

The patchset sent to the CQ was uploaded after l-g-t-m from scottmg@chromium.org
Link to the patchset: https://codereview.chromium.org/2062263002/#ps50001
(title: "merge")

[commit-bot: I haz the power, 2016-06-15 15:52:36]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/2062263002/50001

[commit-bot: I haz the power, 2016-06-15 15:55:22]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-06-15 15:55:24]

Try jobs failed on following builders:
  ios-device-gn on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-device-gn/bui...)
  ios-simulator on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-simulator/bui...)
  ios-simulator-gn on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-simulator-gn/...)
  mac_chromium_compile_dbg_ng on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_comp...)

[jam, 2016-06-15 16:31:13]

Patchset #4 (id:70001) has been deleted

[jam, 2016-06-15 16:31:57]

The CQ bit was checked by jam@chromium.org

[jam, 2016-06-15 16:31:57]

The patchset sent to the CQ was uploaded after l-g-t-m from scottmg@chromium.org
Link to the patchset: https://codereview.chromium.org/2062263002/#ps90001
(title: "merge again")

[commit-bot: I haz the power, 2016-06-15 16:32:20]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/2062263002/90001

[commit-bot: I haz the power, 2016-06-15 17:25:30]

Committed patchset #4 (id:90001)

[commit-bot: I haz the power, 2016-06-15 17:27:00]

Description was changed from

==========
Remove debugging code for fixed bugs. Also clean up unused includes.

BUG=90971,598073
==========

to

==========
Remove debugging code for fixed bugs. Also clean up unused includes.

BUG=90971,598073

Committed: https://crrev.com/95ba699eba9413f257437534e9e58dc42bfc82ae
Cr-Commit-Position: refs/heads/master@{#399943}
==========

[commit-bot: I haz the power, 2016-06-15 17:27:01]

Patchset 4 (id:??) landed as
https://crrev.com/95ba699eba9413f257437534e9e58dc42bfc82ae
Cr-Commit-Position: refs/heads/master@{#399943}