Making the condition for showing signin in one click case more general.

chrome/browser/ui/sync/one_click_signin_helper.cc

Index: chrome/browser/ui/sync/one_click_signin_helper.cc
diff --git a/chrome/browser/ui/sync/one_click_signin_helper.cc b/chrome/browser/ui/sync/one_click_signin_helper.cc
index 580749f0ce7b258e9a64e199996e303737b3007a..59fc87c678ae878306ee373281f2b81215e00769 100644
--- a/chrome/browser/ui/sync/one_click_signin_helper.cc
+++ b/chrome/browser/ui/sync/one_click_signin_helper.cc
@@ -338,13 +338,10 @@ bool AreWeShowingSignin(GURL url, SyncPromoUI::Source source,
       GURL(GaiaUrls::GetInstance()->service_login_url()).ReplaceComponents(
           replacements);
 
-  GURL clean_one_click_url =
-      GURL(GaiaUrls::GetInstance()->gaia_login_form_realm() +
-           "ChromeLoginPrompt").ReplaceComponents(replacements);
-
   return (url.ReplaceComponents(replacements) == clean_login_url &&
           source != SyncPromoUI::SOURCE_UNKNOWN) ||
-      (url.ReplaceComponents(replacements) == clean_one_click_url &&
+      (IsValidGaiaSigninRedirectOrResponseURL(url) &&
+       url.spec().find("ChromeLoginPrompt") != std::string::npos &&
        !email.empty());
 }