Revert^2 "Allow {EXPECT,ASSERT,CHECK,DCHECK}_OK be applied to StatusOr"
This reverts commit 737ac036dde7c869243fbf2104475be1a343d81a.
Reason for revert: Fix the nocompile test by always defining
DCHECK_ALWAYS_ON in the test
Original change's description:
> Revert "Allow {EXPECT,ASSERT,CHECK,DCHECK}_OK be applied to StatusOr"
>
> This reverts commit 64221c2897a0a0c27109accd2a5ccd89c10d8324.
>
> Reason for revert:
> build error; see:
> https://ci.chromium.org/ui/p/chromium/builders/ci/ios-device/326719
>
> Original change's description:
> > Allow {EXPECT,ASSERT,CHECK,DCHECK}_OK be applied to StatusOr
> >
> > Didn't try to change most `*_TRUE(*.has_value())`, as `absl::optional`
> > is also so asserted. Only changed a few unit test files for
> > demonstration purposes. If so desired, we can do the replacement in a
> > separate CL.
> >
> > Bug: b:307554035
> > Change-Id: I0eaa7683ac87f806e25ef3eec3da42674ec89f1a
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5042212
> > Code-Coverage: [email protected] <[email protected]>
> > Reviewed-by: Leonid Baraz <[email protected]>
> > Commit-Queue: Hong Xu <[email protected]>
> > Cr-Commit-Position: refs/heads/main@{#1227023}
>
> Bug: b:307554035
> Change-Id: I1a4c0351040a9acd806eea9008a3faff6937751b
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5047055
> Bot-Commit: Rubber Stamper <[email protected]>
> Commit-Queue: Rubber Stamper <[email protected]>
> Auto-Submit: Matt Reichhoff <[email protected]>
> Owners-Override: Matt Reichhoff <[email protected]>
> Cr-Commit-Position: refs/heads/main@{#1227036}
Bug: b:307554035
Change-Id: Ie15f81a2d929e2e729692136ef478e09559c14ca
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5046737
Reviewed-by: Leonid Baraz <[email protected]>
Commit-Queue: Hong Xu <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1227124}
diff --git a/components/reporting/resources/BUILD.gn b/components/reporting/resources/BUILD.gn
index 3ae6b75d..d77b1f47 100644
--- a/components/reporting/resources/BUILD.gn
+++ b/components/reporting/resources/BUILD.gn
@@ -52,6 +52,7 @@
"//base",
"//base/test:test_support",
"//components/reporting/util:status",
+ "//components/reporting/util:status_macros",
"//components/reporting/util:test_callbacks_support",
"//testing/gmock",
"//testing/gtest",
