diff options
| author | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-22 04:05:07 +0000 |
|---|---|---|
| committer | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-22 04:05:07 +0000 |
| commit | 99e652fd299533d45c199f694f7b4d5f4d22d69c (patch) | |
| tree | 49bf91a1aaf8ec47a72f4550cfb0d78aa624dabf /chrome/browser/sync/profile_sync_service_preference_unittest.cc | |
| parent | a1595312b958e430d54f55b7d93319d52da27d93 (diff) | |
| download | chromium_src-99e652fd299533d45c199f694f7b4d5f4d22d69c.zip chromium_src-99e652fd299533d45c199f694f7b4d5f4d22d69c.tar.gz chromium_src-99e652fd299533d45c199f694f7b4d5f4d22d69c.tar.bz2 | |
"Recommit 118589 - Re-commit r117965 and 117130 with a fix for perf regression."
This reverts commit 51e62c2c61ecde08d0e7cca563624184f634953f.
BUG=108017
TEST=none
TBR=tim@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9138051
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118637 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/profile_sync_service_preference_unittest.cc')
| -rw-r--r-- | chrome/browser/sync/profile_sync_service_preference_unittest.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/sync/profile_sync_service_preference_unittest.cc b/chrome/browser/sync/profile_sync_service_preference_unittest.cc index e217746..44557e8 100644 --- a/chrome/browser/sync/profile_sync_service_preference_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_preference_unittest.cc @@ -15,6 +15,9 @@ #include "base/string_piece.h" #include "chrome/browser/prefs/pref_model_associator.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" +#include "chrome/browser/signin/signin_manager.h" +#include "chrome/browser/signin/signin_manager_factory.h" +#include "chrome/browser/signin/token_service.h" #include "chrome/browser/sync/abstract_profile_sync_service_test.h" #include "chrome/browser/sync/api/sync_data.h" #include "chrome/browser/sync/glue/generic_change_processor.h" @@ -28,7 +31,6 @@ #include "chrome/browser/sync/internal_api/write_transaction.h" #include "chrome/browser/sync/profile_sync_test_util.h" #include "chrome/browser/sync/protocol/preference_specifics.pb.h" -#include "chrome/browser/sync/signin_manager.h" #include "chrome/browser/sync/syncable/model_type.h" #include "chrome/browser/sync/test_profile_sync_service.h" #include "chrome/common/net/gaia/gaia_constants.h" @@ -119,7 +121,7 @@ class ProfileSyncServicePreferenceTest if (service_.get()) return false; - SigninManager* signin = new SigninManager(); + SigninManager* signin = SigninManagerFactory::GetForProfile(profile_.get()); signin->SetAuthenticatedUsername("test"); ProfileSyncComponentsFactoryMock* factory = new ProfileSyncComponentsFactoryMock(); |