Reland "Update TOS"

Updated the iOS UI test.

This reverts commit 9033a96c.

Original change's description:
> Revert "Update TOS"
>
> This reverts commit f88c2f7c.
>
> Reason for revert: Widespread ios bot failures. auto-rollers are blocked.
>
> Original change's description:
> > Update TOS
> >
> > Bring chrome://terms in line with
> > https://www.google.com/chrome/terms/
> >
> > Bug: 1060545
> > Change-Id: I823aa5bdf51c55488777ebb18406b79f9887e6b9
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2120046
> > Reviewed-by: Mike Pinkerton <pinkerton@chromium.org>
> > Reviewed-by: Ted Choc <tedchoc@chromium.org>
> > Reviewed-by: Ben Mason <benmason@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#755585}
>
> TBR=pinkerton@chromium.org,tedchoc@chromium.org,benmason@chromium.org
>
> Change-Id: Ibb4b4c39eff4b9a4276a4e3d64e5ae8552b47452
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: 1060545, 1067086
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2132554
> Reviewed-by: Trent Apted <tapted@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#755690}

TBR=tapted@chromium.org,pinkerton@chromium.org,tedchoc@chromium.org,benmason@chromium.org

Change-Id: I27b47f7f79a00e9f5e3275e7e3de285c1234cc87
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1060545, 1067086
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2133873
Commit-Queue: Ben Mason <benmason@chromium.org>
Reviewed-by: Ben Mason <benmason@chromium.org>
Reviewed-by: Mike Pinkerton <pinkerton@chromium.org>
Cr-Commit-Position: refs/heads/master@{#755838}

ios/chrome/browser/ui/webui/web_ui_egtest.mm

@@ -122,7 +122,8 @@ bool WaitForOmniboxURLString(std::string URL, bool exact_match = true) {
   // Verify that the resulting page is chrome://terms.
   GREYAssert(WaitForOmniboxURLString(kChromeUITermsURL),
              @"Omnibox does not contain URL.");
-  const std::string kTermsText = "Google Chrome Terms of Service";
+  const std::string kTermsText =
+      "Google Chrome and Chrome OS Additional Terms of Service";
   [ChromeEarlGrey waitForWebStateContainingText:kTermsText];
 }