signin: move SigninManagerBase::Signout to SigninManager.

chrome/browser/sync/sync_ui_util_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 <set>
 #include "base/basictypes.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/fake_auth_status_provider.h"
 #include "chrome/browser/signin/fake_signin_manager.h"
@@ skipping 56 matching lines @@
 
 
 // Test that GetStatusLabelsForSyncGlobalError returns an error if a
 // passphrase is required.
 TEST(SyncUIUtilTest, PassphraseGlobalError) {
   MessageLoopForUI message_loop;
   content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop);
   scoped_ptr<Profile> profile(
       ProfileSyncServiceMock::MakeSignedInTestingProfile());
   NiceMock<ProfileSyncServiceMock> service(profile.get());
-  FakeSigninManagerBase signin(profile.get());
+  FakeSigninManagerBase signin;
   browser_sync::SyncBackendHost::Status status;
   EXPECT_CALL(service, QueryDetailedSyncStatus(_))
               .WillRepeatedly(Return(false));
   EXPECT_CALL(service, IsPassphraseRequired())
               .WillRepeatedly(Return(true));
   EXPECT_CALL(service, IsPassphraseRequiredForDecryption())
               .WillRepeatedly(Return(true));
   VerifySyncGlobalErrorResult(
       &service, signin, GoogleServiceAuthError::NONE, true, true);
 }
 
 // Test that GetStatusLabelsForSyncGlobalError returns an error if a
 // passphrase is required and not for auth errors.
 TEST(SyncUIUtilTest, AuthAndPassphraseGlobalError) {
   MessageLoopForUI message_loop;
   content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop);
   scoped_ptr<Profile> profile(
       ProfileSyncServiceMock::MakeSignedInTestingProfile());
   NiceMock<ProfileSyncServiceMock> service(profile.get());
-  FakeSigninManagerBase signin(profile.get());
+  FakeSigninManagerBase signin;
   browser_sync::SyncBackendHost::Status status;
   EXPECT_CALL(service, QueryDetailedSyncStatus(_))
               .WillRepeatedly(Return(false));
 
   EXPECT_CALL(service, IsPassphraseRequired())
               .WillRepeatedly(Return(true));
   EXPECT_CALL(service, IsPassphraseRequiredForDecryption())
               .WillRepeatedly(Return(true));
   EXPECT_CALL(service, HasSyncSetupCompleted())
               .WillRepeatedly(Return(true));
@@ skipping 30 matching lines @@
     GoogleServiceAuthError::CONNECTION_FAILED,
     GoogleServiceAuthError::CAPTCHA_REQUIRED,
     GoogleServiceAuthError::ACCOUNT_DELETED,
     GoogleServiceAuthError::ACCOUNT_DISABLED,
     GoogleServiceAuthError::SERVICE_UNAVAILABLE,
     GoogleServiceAuthError::TWO_FACTOR,
     GoogleServiceAuthError::REQUEST_CANCELED,
     GoogleServiceAuthError::HOSTED_NOT_ALLOWED
   };
 
-  FakeSigninManagerBase signin(profile.get());
+  FakeSigninManagerBase signin;
   for (size_t i = 0; i < arraysize(table); ++i) {
     VerifySyncGlobalErrorResult(&service, signin, table[i], true, false);
     VerifySyncGlobalErrorResult(&service, signin, table[i], false, false);
   }
 }
 
 // TODO(tim): This shouldn't be required. r194857 removed the
 // AuthInProgress override from FakeSigninManager, which meant this test started
 // using the "real" SigninManager AuthInProgress logic. Without that override,
 // it's no longer possible to test both chrome os + desktop flows as part of the
 // same test, because AuthInProgress is always false on chrome os. Most of the
 // tests are unaffected, but STATUS_CASE_AUTHENTICATING can't exist in both
 // versions, so it we will require two separate tests, one using SigninManager
 // and one using SigninManagerBase (which require different setup procedures.
 class FakeSigninManagerForSyncUIUtilTest : public FakeSigninManagerBase {
  public:
   explicit FakeSigninManagerForSyncUIUtilTest(Profile* profile)
-      : FakeSigninManagerBase(profile), auth_in_progress_(false) {
+      : auth_in_progress_(false) {
+    Initialize(profile);
   }
 
   virtual ~FakeSigninManagerForSyncUIUtilTest() {
   }
 
   virtual bool AuthInProgress() const OVERRIDE {
     return auth_in_progress_;
   }
 
   void set_auth_in_progress() {
@@ skipping 137 matching lines @@
       NOTREACHED();
   }
 }
 
 // This test ensures that a each distinctive ProfileSyncService statuses
 // will return a unique combination of status and link messages from
 // GetStatusLabels().
 TEST(SyncUIUtilTest, DistinctCasesReportUniqueMessageSets) {
   std::set<string16> messages;
   for (int idx = 0; idx != NUMBER_OF_STATUS_CASES; idx++) {
-    scoped_ptr<Profile> profile(
-        ProfileSyncServiceMock::MakeSignedInTestingProfile());
+    scoped_ptr<Profile> profile(new TestingProfile());
     ProfileSyncServiceMock service(profile.get());
     FakeSigninManagerForSyncUIUtilTest signin(profile.get());
     signin.SetAuthenticatedUsername("test_user@test.com");
-    FakeAuthStatusProvider provider(signin.signin_global_error());
-    GetDistinctCase(service, &signin, &provider, idx);
+    scoped_ptr<FakeAuthStatusProvider> provider(
+        new FakeAuthStatusProvider(signin.signin_global_error()));
+    GetDistinctCase(service, &signin, provider.get(), idx);
     string16 status_label;
     string16 link_label;
     sync_ui_util::GetStatusLabels(&service,
                                   signin,
                                   sync_ui_util::WITH_HTML,
                                   &status_label,
                                   &link_label);
     // If the status and link message combination is already present in the set
     // of messages already seen, this is a duplicate rather than a unique
     // message, and the test has failed.
     EXPECT_FALSE(status_label.empty()) <<
         "Empty status label returned for case #" << idx;
     string16 combined_label =
         status_label + string16(ASCIIToUTF16("#")) + link_label;
     EXPECT_TRUE(messages.find(combined_label) == messages.end()) <<
         "Duplicate message for case #" << idx << ": " << combined_label;
     messages.insert(combined_label);
     testing::Mock::VerifyAndClearExpectations(&service);
     testing::Mock::VerifyAndClearExpectations(&signin);
+    provider.reset();
+    signin.Shutdown();
   }
 }
 
 // This test ensures that the html_links parameter on GetStatusLabels() is
 // honored.
 TEST(SyncUIUtilTest, HtmlNotIncludedInStatusIfNotRequested) {
   for (int idx = 0; idx != NUMBER_OF_STATUS_CASES; idx++) {
     scoped_ptr<Profile> profile(
         ProfileSyncServiceMock::MakeSignedInTestingProfile());
     ProfileSyncServiceMock service(profile.get());
     FakeSigninManagerForSyncUIUtilTest signin(profile.get());
     signin.SetAuthenticatedUsername("test_user@test.com");
-    FakeAuthStatusProvider provider(signin.signin_global_error());
-    GetDistinctCase(service, &signin, &provider, idx);
+    scoped_ptr<FakeAuthStatusProvider> provider(
+        new FakeAuthStatusProvider(signin.signin_global_error()));
+    GetDistinctCase(service, &signin, provider.get(), idx);
     string16 status_label;
     string16 link_label;
     sync_ui_util::GetStatusLabels(&service,
                                   signin,
                                   sync_ui_util::PLAIN_TEXT,
                                   &status_label,
                                   &link_label);
 
     // Ensures a search for string 'href' (found in links, not a string to be
     // found in an English language message) fails when links are excluded from
     // the status label.
     EXPECT_FALSE(status_label.empty());
     EXPECT_EQ(status_label.find(string16(ASCIIToUTF16("href"))),
               string16::npos);
     testing::Mock::VerifyAndClearExpectations(&service);
     testing::Mock::VerifyAndClearExpectations(&signin);
+    provider.reset();
+    signin.Shutdown();
   }
 }