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