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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
45 | 45 |
46 // static | 46 // static |
47 TestingProfile* ProfileSyncServiceMock::MakeSignedInTestingProfile() { | 47 TestingProfile* ProfileSyncServiceMock::MakeSignedInTestingProfile() { |
48 TestingProfile* profile = new TestingProfile(); | 48 TestingProfile* profile = new TestingProfile(); |
49 SigninManagerFactory::GetForProfile(profile)-> | 49 SigninManagerFactory::GetForProfile(profile)-> |
50 SetAuthenticatedAccountInfo("12345", "foo"); | 50 SetAuthenticatedAccountInfo("12345", "foo"); |
51 return profile; | 51 return profile; |
52 } | 52 } |
53 | 53 |
54 // static | 54 // static |
55 KeyedService* ProfileSyncServiceMock::BuildMockProfileSyncService( | 55 scoped_ptr<KeyedService> ProfileSyncServiceMock::BuildMockProfileSyncService( |
56 content::BrowserContext* profile) { | 56 content::BrowserContext* profile) { |
57 return new ProfileSyncServiceMock(static_cast<Profile*>(profile)); | 57 return make_scoped_ptr( |
| 58 new ProfileSyncServiceMock(static_cast<Profile*>(profile))); |
58 } | 59 } |
OLD | NEW |