GitLab

This reverts commit 2181b01c.

Reason for revert: The offending test
(ContentVerifierTest.FailOnRead) has been taken care of in
CL: https://chromium-review.googlesource.com/c/chromium/src/+/888327

Original change's description:
> Revert "Fix extraneous call to ContentVerifyJob::DispatchFailureCallback."
>
> This reverts commit 6e548ee1.
>
> Reason for revert: DCHECK at content_verify_job.cc:192 occasionally fails (see crbug.com/806586).
>
> Original change's description:
> > Fix extraneous call to ContentVerifyJob::DispatchFailureCallback.
> >
> > If ContentVerifyJob receives hashes (ContentVerifyJob::OnHashesReady)
> > after the content is read (ContentVerifyJob::DoneReading), then it
> > was possible for DispatchFailureCallback to be called more than once.
> > This causes a DCHECK failure in DispatchFailureCallback
> > (DCHECK(!failed_)).
> >
> > Bail out early in OnHashesReady if call to ContentVerifyJob::BytesRead
> > leads to a ContentVerifyJob failure.
> >
> > Note that this isn't harmful in Release builds as
> > DispatchFailureCallback tests ContentVerifyJob::failure_callback_
> > before calling the callback, which is reset once it is called.
> > Nevertheless, this is incorrect behavior and this CL fixes that.
> >
> >
> > Bug: 804630
> > Test: See bug description for repro steps.
> > Change-Id: Icf3a5c8b4c0d01cb20e02de14b11aca4aeff03e5
> > Reviewed-on: https://chromium-review.googlesource.com/879961
> > Reviewed-by: Devlin <rdevlin.cronin@chromium.org>
> > Commit-Queue: Istiaque Ahmed <lazyboy@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#531755}
>
> TBR=lazyboy@chromium.org,rdevlin.cronin@chromium.org
>
> # Not skipping CQ checks because original CL landed > 1 day ago.
>
> Bug: 804630,806586
> Change-Id: Ia5c67f60e95ddb607cb364c745f31dde465d3c4f
> Reviewed-on: https://chromium-review.googlesource.com/893258
> Reviewed-by: vitaliii <vitaliii@chromium.org>
> Commit-Queue: vitaliii <vitaliii@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#532854}

TBR=lazyboy@chromium.org,rdevlin.cronin@chromium.org,vitaliii@chromium.org

Change-Id: I82988d836f49033e1d618125e06f0d45d1124071
Bug: 804630, 806586
Reviewed-on: https://chromium-review.googlesource.com/894824
Commit-Queue: Istiaque Ahmed <lazyboy@chromium.org>
Reviewed-by: Istiaque Ahmed <lazyboy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#533209}