commit e11497bc51059c4c1b2ebf0cd4537ef8e1d20972
author Tsuyoshi Horo <horo@chromium.org> Fri May 25 15:05:32 2018
committer Adam Rice <ricea@chromium.org> Fri May 25 15:05:32 2018
tree a79d206cf76f560042f4c6e2c310f2081db017df
parent e467b467a6eb7884d3990e09d209670c8bda3a43

Merging to M67.

Original commit message:

Stop resetting 10 sec timeout in FetchParameters::MakeSynchronous()

Before https://crrev.com/c/657787, FetchParameters::MakeSynchronous() always
calls SetTimeoutInterval(10). So I thought that 10 second is the default timeout
for all synchronous resouce loading.

But this was wrong. The TimeoutInterval of ResourceRequest was not used. After
the CL the value is used for the timeout in SyncLoadContext. But the default
timeout of sync XMLHttpRequest must be infinite. This caused the bug 844268.

To fix this bug, this CL stops resetting 10 sec timeout in MakeSynchronous().

TBR=horo@chromium.org

Bug: 844268
Change-Id: I7295ec78637548dc810bb3a8a12a54db4cfbc368
Reviewed-on: https://chromium-review.googlesource.com/1068893
Reviewed-by: Adam Rice <ricea@chromium.org>
Reviewed-by: Yutaka Hirano <yhirano@chromium.org>
Commit-Queue: Tsuyoshi Horo <horo@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#561374}(cherry picked from commit 74fca1c37eb569a296207ff8b9a36b6a07567a1e)
Reviewed-on: https://chromium-review.googlesource.com/1073527
Cr-Commit-Position: refs/branch-heads/3396@{#701}
Cr-Branched-From: 9ef2aa869bc7bc0c089e255d698cca6e47d6b038-refs/heads/master@{#550428}