diff options
Diffstat (limited to 'chrome/browser/sync/profile_sync_service_mock.cc')
| -rw-r--r-- | chrome/browser/sync/profile_sync_service_mock.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/chrome/browser/sync/profile_sync_service_mock.cc b/chrome/browser/sync/profile_sync_service_mock.cc index b5755bb..2682fd3 100644 --- a/chrome/browser/sync/profile_sync_service_mock.cc +++ b/chrome/browser/sync/profile_sync_service_mock.cc @@ -1,12 +1,11 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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/prefs/pref_service_mock_builder.h" #include "chrome/browser/prefs/testing_pref_store.h" -#include "chrome/browser/signin/signin_manager.h" -#include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/browser/sync/profile_sync_service_mock.h" +#include "chrome/browser/sync/signin_manager.h" #include "chrome/browser/ui/webui/chrome_url_data_manager.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" @@ -27,7 +26,6 @@ ProfileSyncServiceMock::ProfileSyncServiceMock( } ProfileSyncServiceMock::~ProfileSyncServiceMock() { - delete signin(); } // static @@ -38,8 +36,7 @@ Profile* ProfileSyncServiceMock::MakeSignedInTestingProfile() { .WithUserPrefs(user_prefs) .Create(); profile->SetPrefService(prefs); - // We just blew away our prefs, so reregister them. - SigninManagerFactory::GetInstance()->RegisterUserPrefs(prefs); + SigninManager::RegisterUserPrefs(prefs); user_prefs->SetString(prefs::kGoogleServicesUsername, "foo"); return profile; } |