Move post-signin confirmation bubble to OneClickSigninSyncStarter.

chrome/browser/ui/sync/one_click_signin_helper.h

Index: chrome/browser/ui/sync/one_click_signin_helper.h
diff --git a/chrome/browser/ui/sync/one_click_signin_helper.h b/chrome/browser/ui/sync/one_click_signin_helper.h
index d53a381f7045ef1704bc72dde326d782eac4b6f1..2d7bfaaa888a1d104bb1d6c619c42a6cd67ab335 100644
--- a/chrome/browser/ui/sync/one_click_signin_helper.h
+++ b/chrome/browser/ui/sync/one_click_signin_helper.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/gtest_prod_util.h"
-#include "chrome/browser/signin/signin_tracker.h"
+#include "chrome/browser/sync/profile_sync_service_observer.h"
 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/web_contents_observer.h"
@@ -35,7 +35,6 @@ class URLRequest;
 class OneClickSigninHelper
     : public content::WebContentsObserver,
       public content::WebContentsUserData<OneClickSigninHelper>,
-      public SigninTracker::Observer,
       public ProfileSyncServiceObserver {
  public:
   // Represents user's decision about sign in process.
@@ -189,9 +188,9 @@ class OneClickSigninHelper
                                   int child_id,
                                   int route_id);
 
-  void RedirectToNtpOrAppsPage(bool show_bubble);
+  void RedirectToNtpOrAppsPage();
   void RedirectToSignin();
-  void ShowSyncConfirmationBubble(bool show_bubble);
+  void ShowSigninErrorBubble(const std::string& error);
 
   // Clear all data member of the helper, except for the error.
   void CleanTransientState();
@@ -207,11 +206,6 @@ class OneClickSigninHelper
   virtual void DidStopLoading(
       content::RenderViewHost* render_view_host) OVERRIDE;
 
-  // SigninTracker::Observer override.
-  virtual void GaiaCredentialsValid() OVERRIDE;
-  virtual void SigninFailed(const GoogleServiceAuthError& error) OVERRIDE;
-  virtual void SigninSuccess() OVERRIDE;
-
   // ProfileSyncServiceObserver.
   virtual void OnStateChanged() OVERRIDE;
 
@@ -234,7 +228,6 @@ class OneClickSigninHelper
   // Redirect URL after sync setup is complete.
   GURL redirect_url_;
   std::string error_message_;
-  scoped_ptr<SigninTracker> signin_tracker_;
 
   // Number of navigations since starting a sign in that is outside the
   // the set of trusted Gaia URLs.  Sign in attempts that include visits to
@@ -246,7 +239,7 @@ class OneClickSigninHelper
   // dedicated sign in process (e.g. SAML login, which redirects to a
   // non-google-controlled domain).
   // This is set to true if at least one such URL is detected.
-  bool confirmation_required_;
+  bool untrusted_confirmation_required_;
 
   DISALLOW_COPY_AND_ASSIGN(OneClickSigninHelper);
 };