| 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 "base/base_paths.h" | 7 #include "base/base_paths.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/files/file_util.h" | 9 #include "base/files/file_util.h" |
| 10 #include "base/message_loop/message_loop_proxy.h" | 10 #include "base/message_loop/message_loop_proxy.h" |
| (...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 216 } | 216 } |
| 217 | 217 |
| 218 KeyedService* BuildChromeBookmarkClient( | 218 KeyedService* BuildChromeBookmarkClient( |
| 219 content::BrowserContext* context) { | 219 content::BrowserContext* context) { |
| 220 return new ChromeBookmarkClient(static_cast<Profile*>(context)); | 220 return new ChromeBookmarkClient(static_cast<Profile*>(context)); |
| 221 } | 221 } |
| 222 | 222 |
| 223 KeyedService* BuildChromeHistoryClient( | 223 KeyedService* BuildChromeHistoryClient( |
| 224 content::BrowserContext* context) { | 224 content::BrowserContext* context) { |
| 225 Profile* profile = static_cast<Profile*>(context); | 225 Profile* profile = static_cast<Profile*>(context); |
| 226 return new ChromeHistoryClient(BookmarkModelFactory::GetForProfile(profile), | 226 return new ChromeHistoryClient(BookmarkModelFactory::GetForProfile(profile)); |
| 227 profile, | |
| 228 profile->GetTopSites()); | |
| 229 } | 227 } |
| 230 | 228 |
| 231 void TestProfileErrorCallback(WebDataServiceWrapper::ErrorType error_type, | 229 void TestProfileErrorCallback(WebDataServiceWrapper::ErrorType error_type, |
| 232 sql::InitStatus status) { | 230 sql::InitStatus status) { |
| 233 NOTREACHED(); | 231 NOTREACHED(); |
| 234 } | 232 } |
| 235 | 233 |
| 236 KeyedService* BuildWebDataService(content::BrowserContext* context) { | 234 KeyedService* BuildWebDataService(content::BrowserContext* context) { |
| 237 const base::FilePath& context_path = context->GetPath(); | 235 const base::FilePath& context_path = context->GetPath(); |
| 238 return new WebDataServiceWrapper( | 236 return new WebDataServiceWrapper( |
| (...skipping 825 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1064 #if defined(ENABLE_EXTENSIONS) | 1062 #if defined(ENABLE_EXTENSIONS) |
| 1065 extension_policy_, | 1063 extension_policy_, |
| 1066 #endif | 1064 #endif |
| 1067 pref_service_.Pass(), | 1065 pref_service_.Pass(), |
| 1068 original_profile, | 1066 original_profile, |
| 1069 guest_session_, | 1067 guest_session_, |
| 1070 supervised_user_id_, | 1068 supervised_user_id_, |
| 1071 policy_service_.Pass(), | 1069 policy_service_.Pass(), |
| 1072 testing_factories_); | 1070 testing_factories_); |
| 1073 } | 1071 } |
| OLD | NEW |