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 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
223 profile, ManagedBookmarkServiceFactory::GetForProfile(profile))))); | 223 profile, ManagedBookmarkServiceFactory::GetForProfile(profile))))); |
224 bookmark_model->Load(profile->GetPrefs(), | 224 bookmark_model->Load(profile->GetPrefs(), |
225 profile->GetPath(), | 225 profile->GetPath(), |
226 profile->GetIOTaskRunner(), | 226 profile->GetIOTaskRunner(), |
227 content::BrowserThread::GetMessageLoopProxyForThread( | 227 content::BrowserThread::GetMessageLoopProxyForThread( |
228 content::BrowserThread::UI)); | 228 content::BrowserThread::UI)); |
229 return std::move(bookmark_model); | 229 return std::move(bookmark_model); |
230 } | 230 } |
231 | 231 |
232 void TestProfileErrorCallback(WebDataServiceWrapper::ErrorType error_type, | 232 void TestProfileErrorCallback(WebDataServiceWrapper::ErrorType error_type, |
233 sql::InitStatus status) { | 233 sql::InitStatus status, |
| 234 const sql::DatabaseDiagnosticMap& diagnostics) { |
234 NOTREACHED(); | 235 NOTREACHED(); |
235 } | 236 } |
236 | 237 |
237 std::unique_ptr<KeyedService> BuildWebDataService( | 238 std::unique_ptr<KeyedService> BuildWebDataService( |
238 content::BrowserContext* context) { | 239 content::BrowserContext* context) { |
239 const base::FilePath& context_path = context->GetPath(); | 240 const base::FilePath& context_path = context->GetPath(); |
240 return base::WrapUnique(new WebDataServiceWrapper( | 241 return base::WrapUnique(new WebDataServiceWrapper( |
241 context_path, g_browser_process->GetApplicationLocale(), | 242 context_path, g_browser_process->GetApplicationLocale(), |
242 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI), | 243 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI), |
243 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB), | 244 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB), |
(...skipping 821 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1065 // Note: Owned by |original_profile|. | 1066 // Note: Owned by |original_profile|. |
1066 return new TestingProfile(path_, delegate_, | 1067 return new TestingProfile(path_, delegate_, |
1067 #if defined(ENABLE_EXTENSIONS) | 1068 #if defined(ENABLE_EXTENSIONS) |
1068 extension_policy_, | 1069 extension_policy_, |
1069 #endif | 1070 #endif |
1070 std::move(pref_service_), original_profile, | 1071 std::move(pref_service_), original_profile, |
1071 guest_session_, supervised_user_id_, | 1072 guest_session_, supervised_user_id_, |
1072 std::move(policy_service_), testing_factories_, | 1073 std::move(policy_service_), testing_factories_, |
1073 profile_name_); | 1074 profile_name_); |
1074 } | 1075 } |
OLD | NEW |