[iOS] Restrict GAIA cookie restore logic to a subset of Google domains.

The Google homepage and Search present consent notifications when the
user is signed out. Since GAIA restore logic currently works on a user
refresh then avoid triggering restore when the content area UI may
conflict with the sign-in notification.

Bug: 1131027, 1149902
Change-Id: I4d2b186f126c7fc14f8595062a08bb0fb72212d3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2540671
Commit-Queue: Nohemi Fernandez <fernandex@chromium.org>
Reviewed-by: Jérôme Lebel <jlebel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828222}

components/signin/ios/browser/account_consistency_service.mm

@@ -165,13 +165,20 @@ void AccountConsistencyHandler::ShouldAllowResponse(
   if (google_util::IsGoogleDomainUrl(
           url, google_util::ALLOW_SUBDOMAIN,
           google_util::DISALLOW_NON_STANDARD_PORTS)) {
-    // Reset boolean that tracks displaying the sign-in notification infobar.
-    // This ensures that only the most recent navigation will trigger an
-    // infobar.
-    gaia_cookies_restored_ = false;
-    account_consistency_service_->SetGaiaCookiesIfDeleted(
-        base::BindOnce(&AccountConsistencyHandler::MarkGaiaCookiesRestored,
-                       weak_ptr_factory_.GetWeakPtr()));
+    // TODO(crbug.com/1131027): Disable GAIA cookie restore on Google URLs that
+    // may display cookie consent in the content area that conflict with the
+    // sign-in notification. This will be removed once we perform cookie
+    // restoration before sending a navigation request.
+    if (!(google_util::IsGoogleHomePageUrl(url) ||
+          google_util::IsGoogleSearchUrl(url))) {
+      // Reset boolean that tracks displaying the sign-in notification infobar.
+      // This ensures that only the most recent navigation will trigger an
+      // infobar.
+      gaia_cookies_restored_ = false;
+      account_consistency_service_->SetGaiaCookiesIfDeleted(
+          base::BindOnce(&AccountConsistencyHandler::MarkGaiaCookiesRestored,
+                         weak_ptr_factory_.GetWeakPtr()));
+    }
   }
 
   if (!gaia::IsGaiaSignonRealm(url.GetOrigin())) {