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/test/base/testing_profile.h" | 5 #include "chrome/test/base/testing_profile.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/base_paths.h" | 9 #include "base/base_paths.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
218 new BookmarkModel(base::WrapUnique(new ChromeBookmarkClient( | 218 new BookmarkModel(base::WrapUnique(new ChromeBookmarkClient( |
219 profile, ManagedBookmarkServiceFactory::GetForProfile(profile))))); | 219 profile, ManagedBookmarkServiceFactory::GetForProfile(profile))))); |
220 bookmark_model->Load(profile->GetPrefs(), | 220 bookmark_model->Load(profile->GetPrefs(), |
221 profile->GetPath(), | 221 profile->GetPath(), |
222 profile->GetIOTaskRunner(), | 222 profile->GetIOTaskRunner(), |
223 content::BrowserThread::GetMessageLoopProxyForThread( | 223 content::BrowserThread::GetMessageLoopProxyForThread( |
224 content::BrowserThread::UI)); | 224 content::BrowserThread::UI)); |
225 return std::move(bookmark_model); | 225 return std::move(bookmark_model); |
226 } | 226 } |
227 | 227 |
228 void TestProfileErrorCallback(WebDataServiceWrapper::ErrorType error_type, | 228 void TestProfileErrorCallback(const base::FilePath& file_path, |
| 229 WebDataServiceWrapper::ErrorType error_type, |
229 sql::InitStatus status) { | 230 sql::InitStatus status) { |
230 NOTREACHED(); | 231 NOTREACHED(); |
231 } | 232 } |
232 | 233 |
233 std::unique_ptr<KeyedService> BuildWebDataService( | 234 std::unique_ptr<KeyedService> BuildWebDataService( |
234 content::BrowserContext* context) { | 235 content::BrowserContext* context) { |
235 const base::FilePath& context_path = context->GetPath(); | 236 const base::FilePath& context_path = context->GetPath(); |
236 return base::WrapUnique(new WebDataServiceWrapper( | 237 return base::WrapUnique(new WebDataServiceWrapper( |
237 context_path, g_browser_process->GetApplicationLocale(), | 238 context_path, g_browser_process->GetApplicationLocale(), |
238 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI), | 239 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI), |
(...skipping 793 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1032 // Note: Owned by |original_profile|. | 1033 // Note: Owned by |original_profile|. |
1033 return new TestingProfile(path_, delegate_, | 1034 return new TestingProfile(path_, delegate_, |
1034 #if defined(ENABLE_EXTENSIONS) | 1035 #if defined(ENABLE_EXTENSIONS) |
1035 extension_policy_, | 1036 extension_policy_, |
1036 #endif | 1037 #endif |
1037 std::move(pref_service_), original_profile, | 1038 std::move(pref_service_), original_profile, |
1038 guest_session_, supervised_user_id_, | 1039 guest_session_, supervised_user_id_, |
1039 std::move(policy_service_), testing_factories_, | 1040 std::move(policy_service_), testing_factories_, |
1040 profile_name_); | 1041 profile_name_); |
1041 } | 1042 } |
OLD | NEW |