Componentize FakeSigninManager and SigninManager prefs

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/strings/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/signin/fake_signin_manager.h"
+#include "chrome/browser/signin/account_tracker_service_factory.h"
+#include "chrome/browser/signin/chrome_signin_client_factory.h"
 #include "chrome/browser/signin/signin_error_controller_factory.h"
 #include "chrome/browser/sync/profile_sync_service_mock.h"
 #include "chrome/browser/sync/sync_ui_util.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/signin/core/browser/fake_auth_status_provider.h"
+#include "components/signin/core/browser/fake_signin_manager.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "content/public/test/test_browser_thread.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gmock/include/gmock/gmock-actions.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using ::testing::AtMost;
 using ::testing::NiceMock;
@@ skipping 120 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(
+      ChromeSigninClientFactory::GetForProfile(profile.get()),
+      AccountTrackerServiceFactory::GetForProfile(profile.get()));
   for (size_t i = 0; i < arraysize(table); ++i) {
     VerifySyncGlobalErrorResult(&service,
                                 table[i],
                                 true /* signed in */,
                                 false /* no error */);
     VerifySyncGlobalErrorResult(&service,
                                 table[i],
                                 false /* not signed in */,
                                 false /* no error */);
   }
 }
 #endif
 
 // 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) {
+      : FakeSigninManagerBase(
+            ChromeSigninClientFactory::GetForProfile(profile),
+            AccountTrackerServiceFactory::GetForProfile(profile)),
+        auth_in_progress_(false) {
     Initialize(NULL);
   }
 
   ~FakeSigninManagerForSyncUIUtilTest() override {}
 
   bool AuthInProgress() const override { return auth_in_progress_; }
 
   void set_auth_in_progress() {
     auth_in_progress_ = true;
   }
@@ skipping 205 matching lines @@
     EXPECT_FALSE(status_label.empty());
     EXPECT_EQ(status_label.find(base::ASCIIToUTF16("href")),
               base::string16::npos);
     testing::Mock::VerifyAndClearExpectations(&service);
     testing::Mock::VerifyAndClearExpectations(&signin);
     EXPECT_CALL(service, GetAuthError()).WillRepeatedly(ReturnRef(error));
     provider.reset();
     signin.Shutdown();
   }
 }