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

chrome/browser/ui/sync/one_click_signin_helper.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/sync/one_click_signin_helper.h"
 
 #include <algorithm>
 #include <functional>
 #include <utility>
 #include <vector>
@@ skipping 320 matching lines @@
 // NOTE: This should only be used for logging purposes since it relies on hard
 // coded URLs that could change.
 bool AreWeShowingSignin(GURL url, SyncPromoUI::Source source,
                         std::string email) {
   GURL::Replacements replacements;
   replacements.ClearQuery();
   GURL clean_login_url =
       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());
 }
 
 
 // ConfirmEmailDialogDelegate -------------------------------------------------
 
 class ConfirmEmailDialogDelegate : public TabModalConfirmDialogDelegate {
  public:
   // Callback indicating action performed by the user.  The argument to the
   // callback is the ID of the button pressed by the user.
@@ skipping 908 matching lines @@
     contents->GetController().LoadURL(redirect_url_,
                                       content::Referrer(),
                                       content::PAGE_TRANSITION_AUTO_TOPLEVEL,
                                       std::string());
   }
 
   // Clear the redirect URL.
   redirect_url_ = GURL();
   sync_service->RemoveObserver(this);
 }