Reland "refactor notice model tests"

This reverts commit 46ff3e715860c5821fb5b31fd9c2ab50de4d7c52.

Reason for revert: Fixed compilation error in parent CL

Original change's description:
> Revert "refactor notice model tests"
>
> This reverts commit e761ea907ecef47b04a10bf54e0cda353b74a2bd.
>
> Reason for revert: This CL must be reverted so that crrev.com/c/6431568
> can be reverted after that. Reverting due to compile issues that close 
> the tree:
>  - https://ci.chromium.org/ui/p/chromium/builders/ci/android-oreo-x86-rel/13650/overview
>  - https://ci.chromium.org/ui/p/chromium/builders/ci/Linux%20MSan%20Builder/91334/overview
>
> Original change's description:
> > refactor notice model tests
> >
> > the unit test now clearly separates out the components being tested:
> > Notice/Consent first,
> > NoticeApi,
> > then the NoticeCatalog.
> >
> > Bug: 408017260
> > Change-Id: Icaee4d79f38e85e79ab88ae299dc3d08e98f5674
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6433466
> > Reviewed-by: Jacob Stanley <jacobstanley@google.com>
> > Commit-Queue: Abe Boujane <boujane@google.com>
> > Auto-Submit: Abe Boujane <boujane@google.com>
> > Cr-Commit-Position: refs/heads/main@{#1442801}
>
> Bug: 408017260
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Change-Id: I76171a36c1ca572d5f067e6aa23250993551155d
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6432155
> Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
> Auto-Submit: thefrog <thefrog@chromium.org>
> Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
> Owners-Override: thefrog <thefrog@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#1442818}

Bug: 408017260
Change-Id: Ie67fdc095231a6cc289ab16513b6d12903b393f5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6438237
Reviewed-by: Jacob Stanley <jacobstanley@google.com>
Commit-Queue: Abe Boujane <boujane@google.com>
Cr-Commit-Position: refs/heads/main@{#1443734}