Componentize FakeSigninManager and SigninManager prefs

chrome/browser/signin/cross_device_promo_unittest.cc

 // Copyright 2015 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/signin/cross_device_promo.h"
 
 #include "base/metrics/field_trial.h"
 #include "base/run_loop.h"
 #include "base/test/histogram_tester.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/prefs/pref_service_syncable.h"
 #include "chrome/browser/signin/chrome_signin_client_factory.h"
 #include "chrome/browser/signin/cross_device_promo_factory.h"
 #include "chrome/browser/signin/fake_gaia_cookie_manager_service.h"
-#include "chrome/browser/signin/fake_signin_manager.h"
+#include "chrome/browser/signin/fake_signin_manager_builder.h"
 #include "chrome/browser/signin/gaia_cookie_manager_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/signin/test_signin_client_builder.h"
 #include "chrome/common/pref_names.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 "components/signin/core/browser/signin_manager.h"
 #include "components/signin/core/browser/signin_metrics.h"
@@ skipping 96 matching lines @@
       new TestingProfileManager(TestingBrowserProcess::GetGlobal()));
   ASSERT_TRUE(testing_profile_manager_.get()->SetUp());
 
   TestingProfile::TestingFactories factories;
   factories.push_back(std::make_pair(ChromeSigninClientFactory::GetInstance(),
                                      signin::BuildTestSigninClient));
   factories.push_back(
       std::make_pair(GaiaCookieManagerServiceFactory::GetInstance(),
                      FakeGaiaCookieManagerService::Build));
   factories.push_back(std::make_pair(SigninManagerFactory::GetInstance(),
-                                     FakeSigninManagerBase::Build));
+                                     BuildFakeSigninManagerBase));
 
   pref_service_ = new TestingPrefServiceSyncable();
   chrome::RegisterUserProfilePrefs(pref_service_->registry());
 
   profile_ = testing_profile_manager_.get()->CreateTestingProfile(
       "name", make_scoped_ptr<PrefServiceSyncable>(pref_service_),
       base::UTF8ToUTF16("name"), 0, std::string(), factories);
 
   cookie_manager_service_ = static_cast<FakeGaiaCookieManagerService*>(
       GaiaCookieManagerServiceFactory::GetForProfile(profile()));
@@ skipping 504 matching lines @@
     EXPECT_EQ(2, prefs()->GetInteger(prefs::kCrossDevicePromoNumDevices));
     EXPECT_EQ(device2_last_active.ToInternalValue(),
               prefs()->GetInt64(prefs::kCrossDevicePromoLastDeviceActiveTime));
     EXPECT_TRUE(prefs()->GetBoolean(prefs::kCrossDevicePromoShouldBeShown));
     test_two_devices.ExpectUniqueSample("Signin.XDevicePromo.Eligibility",
                                         signin_metrics::ELIGIBLE, 1);
     EXPECT_TRUE(observer.is_eligible());
     EXPECT_EQ(1, observer.times_set_eligible());
   }
 }