Convert SigninTracker to use OAuth2TokenService notifications

chrome/browser/ui/sync/one_click_signin_helper_unittest.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 "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
+#include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_io_data.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/signin/fake_profile_oauth2_token_service.h"
 #include "chrome/browser/signin/fake_signin_manager.h"
+#include "chrome/browser/signin/profile_oauth2_token_service.h"
+#include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/signin/signin_names_io_thread.h"
 #include "chrome/browser/signin/signin_promo.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/sync/profile_sync_service_mock.h"
 #include "chrome/browser/sync/test_profile_sync_service.h"
 #include "chrome/browser/ui/sync/one_click_signin_helper.h"
+#include "chrome/browser/ui/webui/signin/login_ui_service.h"
+#include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_pref_service_syncable.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/testing_profile_manager.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/frame_navigate_params.h"
@@ skipping 21 matching lines @@
     "?service=foo&continue=http://foo.google.com";
 
 class SigninManagerMock : public FakeSigninManager {
  public:
   explicit SigninManagerMock(Profile* profile) : FakeSigninManager(profile) {
     Initialize(profile, NULL);
   }
   MOCK_CONST_METHOD1(IsAllowedUsername, bool(const std::string& username));
 };
 
+static BrowserContextKeyedService* BuildSigninManagerMock(
+    content::BrowserContext* profile) {
+  return new SigninManagerMock(static_cast<Profile*>(profile));
+}
+
+class FakeLoginUI : public LoginUIService::LoginUI {
+  virtual void FocusUI() OVERRIDE {}
+  virtual void CloseUI() OVERRIDE {}
+};
+
 class TestProfileIOData : public ProfileIOData {
  public:
   TestProfileIOData(bool is_incognito, PrefService* pref_service,
                     PrefService* local_state, CookieSettings* cookie_settings)
       : ProfileIOData(is_incognito) {
     // Initialize the IO members required for these tests, but keep them on
     // this thread since we don't use a background thread here.
     google_services_username()->Init(prefs::kGoogleServicesUsername,
                                      pref_service);
     reverse_autologin_enabled()->Init(prefs::kReverseAutologinEnabled,
@@ skipping 109 matching lines @@
        : TestProfileSyncService(NULL,
                                 profile,
                                 NULL,
                                 ProfileSyncService::MANUAL_START,
                                 false),  // synchronous_backend_init
          first_setup_in_progress_(false) {}
 
    bool first_setup_in_progress_;
 };
 
-static BrowserContextKeyedService* BuildSigninManagerMock(
-    content::BrowserContext* profile) {
-  return new SigninManagerMock(static_cast<Profile*>(profile));
-}
-
 }  // namespace
 
 class OneClickSigninHelperTest : public ChromeRenderViewHostTestHarness {
  public:
   OneClickSigninHelperTest();
 
   virtual void SetUp() OVERRIDE;
   virtual void TearDown() OVERRIDE;
 
   // Creates the sign-in manager for tests.  If |username| is
   // is not empty, the profile of the mock WebContents will be connected to
   // the given account.
   void CreateSigninManager(const std::string& username);
 
   // Set the ID of the signin process that the test will assume to be the
   // only process allowed to sign the user in to Chrome.
   void SetTrustedSigninProcessID(int id);
 
   void AddEmailToOneClickRejectedList(const std::string& email);
   void EnableOneClick(bool enable);
   void AllowSigninCookies(bool enable);
   void SetAllowedUsernamePattern(const std::string& pattern);
   ProfileSyncServiceMock* CreateProfileSyncServiceMock();
   void SubmitGAIAPassword(OneClickSigninHelper* helper);
-  OneClickSigninHelper* SetupHelperForSignin();
 
   SigninManagerMock* signin_manager_;
+  FakeProfileOAuth2TokenService* fake_oauth2_token_service_;
 
  protected:
   GoogleServiceAuthError no_error_;
 
  private:
+  // ChromeRenderViewHostTestHarness overrides:
+  virtual content::BrowserContext* CreateBrowserContext() OVERRIDE;
+
   // The ID of the signin process the test will assume to be trusted.
   // By default, set to the test RenderProcessHost's process ID, but
   // overridden by SetTrustedSigninProcessID.
   int trusted_signin_process_id_;
 
   DISALLOW_COPY_AND_ASSIGN(OneClickSigninHelperTest);
 };
 
 OneClickSigninHelperTest::OneClickSigninHelperTest()
-    : no_error_(GoogleServiceAuthError::NONE),
+    : signin_manager_(NULL),
+      fake_oauth2_token_service_(NULL),
+      no_error_(GoogleServiceAuthError::NONE),
       trusted_signin_process_id_(-1) {
 }
 
 void OneClickSigninHelperTest::SetUp() {
   signin::ForceWebBasedSigninFlowForTesting(true);
   content::RenderViewHostTestHarness::SetUp();
   SetTrustedSigninProcessID(process()->GetID());
 }
 
 void OneClickSigninHelperTest::TearDown() {
@@ skipping 63 matching lines @@
 
 void OneClickSigninHelperTest::SubmitGAIAPassword(
     OneClickSigninHelper* helper) {
   content::PasswordForm password_form;
   password_form.origin = GURL("https://accounts.google.com");
   password_form.signon_realm = "https://accounts.google.com";
   password_form.password_value = UTF8ToUTF16("password");
   helper->PasswordSubmitted(password_form);
 }
 
+content::BrowserContext* OneClickSigninHelperTest::CreateBrowserContext() {
+  TestingProfile::Builder builder;
+  builder.AddTestingFactory(ProfileOAuth2TokenServiceFactory::GetInstance(),
+                            FakeProfileOAuth2TokenService::Build);
+  scoped_ptr<TestingProfile> profile = builder.Build();
+
+  fake_oauth2_token_service_ =
+      static_cast<FakeProfileOAuth2TokenService*>(
+          ProfileOAuth2TokenServiceFactory::GetForProfile(profile.get()));
+
+  return profile.release();
+}
+
 class OneClickSigninHelperIOTest : public OneClickSigninHelperTest {
  public:
   OneClickSigninHelperIOTest();
 
   virtual void SetUp() OVERRIDE;
 
   TestProfileIOData* CreateTestProfileIOData(bool is_incognito);
 
  protected:
   TestingProfileManager testing_profile_manager_;
@@ skipping 337 matching lines @@
       "session_index", "user@gmail.com",
       OneClickSigninHelper::AUTO_ACCEPT_EXPLICIT,
       signin::SOURCE_WEBSTORE_INSTALL,
       continueUrl, process()->GetID(), rvh()->GetRoutingID());
 
   SubmitGAIAPassword(helper);
 
   NavigateAndCommit(GURL("https://chrome.google.com/webstore?source=3"));
   helper->DidStopLoading(rvh());
 
+  fake_oauth2_token_service_->IssueRefreshToken("refresh_token");
+  FakeLoginUI fake_login_ui;
+  LoginUIServiceFactory::GetForProfile(profile())->SetLoginUI(&fake_login_ui);
+  GoogleServiceSigninSuccessDetails details("user@gmail.com", "password");
+  content::NotificationService::current()->Notify(
+      chrome::NOTIFICATION_GOOGLE_SIGNIN_SUCCESSFUL,

[Andrew T Wilson (Slow), 2013/09/09 12:08:27]

Why do we send out SIGNIN_SUCCESSFUL - does anyone listen to this in this test?

[Roger Tawa OOO till Jul 10th, 2013/09/10 14:29:23]

Done.  Turns out none of this is really needed.  I had written this code to make
sure that OneClickSigninSyncStarter would be deleted.  I removed it all, but
this required a bit of an hack with |do_not_start_sync_for_testing_|.  I did it
like this because otherwise I'd need to move |struct StartSyncArgs| and the
StartSync() declaration to the public .h file, which seems like an uglier hack. 
If you have a better suggestion though, let me know.

+      content::Source<Profile>(profile()),
+      content::Details<const GoogleServiceSigninSuccessDetails>(&details));
+  LoginUIServiceFactory::GetForProfile(profile())->
+      LoginUIClosed(&fake_login_ui);
+
   helper->OnStateChanged();
   EXPECT_EQ(GURL(continueUrl), contents->GetURL());
   EXPECT_EQ("user@gmail.com", signin_manager_->GetAuthenticatedUsername());
 }
 
 // Checks that the state of OneClickSigninHelper is cleaned when there is a
 // navigation away from the sign in flow that is not triggered by the
 // web contents.
 TEST_F(OneClickSigninHelperTest, CleanTransientStateOnNavigate) {
   content::WebContents* contents = web_contents();
@@ skipping 178 matching lines @@
       prefs::kSigninAllowed, base::Value::CreateBooleanValue(true));
 
   // Simulate a policy disabling sync by writing kSyncManaged directly.
   // We should still offer to sign in the browser.
   profile()->GetTestingPrefService()->SetManagedPref(
       prefs::kSyncManaged, base::Value::CreateBooleanValue(true));
   EXPECT_EQ(OneClickSigninHelper::CAN_OFFER,
             OneClickSigninHelper::CanOfferOnIOThreadImpl(
                 valid_gaia_url_, std::string(), &request_, io_data.get()));
 }