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 294 matching lines @@
 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);

[Roger Tawa OOO till Jul 10th, 2013/05/10 16:52:13]

I think you can get rid of this variable.

[jwd, 2013/05/27 22:52:35]

Done.

 
   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 952 matching lines @@
     }
   }
   ShowSyncConfirmationBubble(display_bubble);
   signin_tracker_.reset();
 }
 
 void OneClickSigninHelper::SigninSuccess() {
   ShowSyncConfirmationBubble(true);
   signin_tracker_.reset();
 }