commit c0d24a87f706a0627c1f540f8c8e8c6750c675a7
author Kinuko Yasuda <kinuko@chromium.org> Thu Jan 24 06:11:44 2019
committer Commit Bot <commit-bot@chromium.org> Thu Jan 24 06:11:44 2019
tree 8d07dddc188d16f35a7d72ac59c2203ce3dee7a6
parent 08b80f14e0050152ddc5936327e9ad1041440b31

Revert "Re-implement CrOS merge session throttle in the network service."

This reverts commit 4e6965956ec5ecbfdace5eb4989609f4887c632c.

Reason for revert: Suspected to cause crashes on these tests:

CastSessionBrowserTest.CreateAndDestroy
InstantProcessNavigationTest.ForkForNavigationsToNewTabURLs

Both crashing on ChromeRenderThreadObserver

Received signal 11 SEGV_MAPERR 000000000000
#0 0x55de2b025d59 base::debug::CollectStackTrace()
#1 0x55de2af9a183 base::debug::StackTrace::StackTrace()
#2 0x55de2b0258e1 base::debug::(anonymous namespace)::StackDumpSignalHandler()
#3 0x7f5b34da4330 <unknown>
#4 0x55de2b44a78b ChromeRenderThreadObserver::ChromeRenderThreadObserver()
#5 0x55de2b441dc4 ChromeContentRendererClient::RenderThreadStarted()

Original change's description:
> Re-implement CrOS merge session throttle in the network service.
> 
> This change re-implements the resource load throttle that waits for the
> Chrome OS merge session to complete (or timeout) before allowing resource
> loads. This implementation is compatible with the network service. Previously
> this was implemented by the MergeSessionResourceThrottle class, but is
> now implemented by MergeSessionLoaderThrottle.
> 
> Bug: 897986
> Change-Id: I0a4d2e1961504bd1a979a1d964d62f9ec17b8b33
> Reviewed-on: https://chromium-review.googlesource.com/c/1318412
> Commit-Queue: Chris Mumford <cmumford@google.com>
> Reviewed-by: John Abd-El-Malek <jam@chromium.org>
> Reviewed-by: Ken Buchanan <kenrb@chromium.org>
> Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#625501}

TBR=xiyuan@chromium.org,kenrb@chromium.org,jam@chromium.org,cmumford@google.com

Change-Id: Ibffe2a34608db94c7d86c9b16bcd037a2c23fad6
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 897986
Reviewed-on: https://chromium-review.googlesource.com/c/1433389
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Commit-Queue: Kinuko Yasuda <kinuko@chromium.org>
Cr-Commit-Position: refs/heads/master@{#625529}