| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "ios/chrome/browser/browser_state/test_chrome_browser_state.h" | 5 #include "ios/chrome/browser/browser_state/test_chrome_browser_state.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/files/file_util.h" | 10 #include "base/files/file_util.h" |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 std::unique_ptr<bookmarks::BookmarkModel> bookmark_model( | 64 std::unique_ptr<bookmarks::BookmarkModel> bookmark_model( |
| 65 new bookmarks::BookmarkModel( | 65 new bookmarks::BookmarkModel( |
| 66 base::WrapUnique(new BookmarkClientImpl(browser_state)))); | 66 base::WrapUnique(new BookmarkClientImpl(browser_state)))); |
| 67 bookmark_model->Load( | 67 bookmark_model->Load( |
| 68 browser_state->GetPrefs(), | 68 browser_state->GetPrefs(), |
| 69 browser_state->GetStatePath(), browser_state->GetIOTaskRunner(), | 69 browser_state->GetStatePath(), browser_state->GetIOTaskRunner(), |
| 70 web::WebThread::GetTaskRunnerForThread(web::WebThread::UI)); | 70 web::WebThread::GetTaskRunnerForThread(web::WebThread::UI)); |
| 71 return std::move(bookmark_model); | 71 return std::move(bookmark_model); |
| 72 } | 72 } |
| 73 | 73 |
| 74 void NotReachedErrorCallback(WebDataServiceWrapper::ErrorType error_type, | 74 void NotReachedErrorCallback(WebDataServiceWrapper::ErrorType, |
| 75 sql::InitStatus status) { | 75 sql::InitStatus, |
| 76 const std::string&) { |
| 76 NOTREACHED(); | 77 NOTREACHED(); |
| 77 } | 78 } |
| 78 | 79 |
| 79 std::unique_ptr<KeyedService> BuildWebDataService(web::BrowserState* context) { | 80 std::unique_ptr<KeyedService> BuildWebDataService(web::BrowserState* context) { |
| 80 const base::FilePath& browser_state_path = context->GetStatePath(); | 81 const base::FilePath& browser_state_path = context->GetStatePath(); |
| 81 return base::WrapUnique(new WebDataServiceWrapper( | 82 return base::WrapUnique(new WebDataServiceWrapper( |
| 82 browser_state_path, GetApplicationContext()->GetApplicationLocale(), | 83 browser_state_path, GetApplicationContext()->GetApplicationLocale(), |
| 83 web::WebThread::GetTaskRunnerForThread(web::WebThread::UI), | 84 web::WebThread::GetTaskRunnerForThread(web::WebThread::UI), |
| 84 web::WebThread::GetTaskRunnerForThread(web::WebThread::DB), | 85 web::WebThread::GetTaskRunnerForThread(web::WebThread::DB), |
| 85 ios::sync_start_util::GetFlareForSyncableService(browser_state_path), | 86 ios::sync_start_util::GetFlareForSyncableService(browser_state_path), |
| (...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 418 pref_service_ = std::move(prefs); | 419 pref_service_ = std::move(prefs); |
| 419 } | 420 } |
| 420 | 421 |
| 421 std::unique_ptr<TestChromeBrowserState> | 422 std::unique_ptr<TestChromeBrowserState> |
| 422 TestChromeBrowserState::Builder::Build() { | 423 TestChromeBrowserState::Builder::Build() { |
| 423 DCHECK(!build_called_); | 424 DCHECK(!build_called_); |
| 424 return base::WrapUnique(new TestChromeBrowserState( | 425 return base::WrapUnique(new TestChromeBrowserState( |
| 425 state_path_, std::move(pref_service_), testing_factories_, | 426 state_path_, std::move(pref_service_), testing_factories_, |
| 426 refcounted_testing_factories_)); | 427 refcounted_testing_factories_)); |
| 427 } | 428 } |
| OLD | NEW |