| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/sync/profile_sync_service_mock.h" | 5 #include "chrome/browser/sync/profile_sync_service_mock.h" |
| 6 | 6 |
| 7 #include "base/prefs/pref_service.h" | 7 #include "base/prefs/pref_service.h" |
| 8 #include "base/prefs/testing_pref_store.h" | 8 #include "base/prefs/testing_pref_store.h" |
| 9 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" | 9 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" |
| 10 #include "chrome/browser/signin/signin_manager_factory.h" | 10 #include "chrome/browser/signin/signin_manager_factory.h" |
| (...skipping 30 matching lines...) Expand all Loading... |
| 41 | 41 |
| 42 // static | 42 // static |
| 43 TestingProfile* ProfileSyncServiceMock::MakeSignedInTestingProfile() { | 43 TestingProfile* ProfileSyncServiceMock::MakeSignedInTestingProfile() { |
| 44 TestingProfile* profile = new TestingProfile(); | 44 TestingProfile* profile = new TestingProfile(); |
| 45 SigninManagerFactory::GetForProfile(profile)-> | 45 SigninManagerFactory::GetForProfile(profile)-> |
| 46 SetAuthenticatedAccountInfo("12345", "foo"); | 46 SetAuthenticatedAccountInfo("12345", "foo"); |
| 47 return profile; | 47 return profile; |
| 48 } | 48 } |
| 49 | 49 |
| 50 // static | 50 // static |
| 51 KeyedService* ProfileSyncServiceMock::BuildMockProfileSyncService( | 51 scoped_ptr<KeyedService> ProfileSyncServiceMock::BuildMockProfileSyncService( |
| 52 content::BrowserContext* profile) { | 52 content::BrowserContext* profile) { |
| 53 return new ProfileSyncServiceMock(static_cast<Profile*>(profile)); | 53 return make_scoped_ptr( |
| 54 new ProfileSyncServiceMock(static_cast<Profile*>(profile))); |
| 54 } | 55 } |
| OLD | NEW |