| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/history/history_service_factory.h" | 5 #include "ios/chrome/browser/history/history_service_factory.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/memory/ptr_util.h" |
| 9 #include "base/memory/singleton.h" | 10 #include "base/memory/singleton.h" |
| 10 #include "components/history/core/browser/history_database_params.h" | 11 #include "components/history/core/browser/history_database_params.h" |
| 11 #include "components/history/core/browser/history_service.h" | 12 #include "components/history/core/browser/history_service.h" |
| 12 #include "components/history/core/browser/visit_delegate.h" | 13 #include "components/history/core/browser/visit_delegate.h" |
| 13 #include "components/history/ios/browser/history_database_helper.h" | 14 #include "components/history/ios/browser/history_database_helper.h" |
| 14 #include "components/keyed_service/core/service_access_type.h" | 15 #include "components/keyed_service/core/service_access_type.h" |
| 15 #include "components/keyed_service/ios/browser_state_dependency_manager.h" | 16 #include "components/keyed_service/ios/browser_state_dependency_manager.h" |
| 16 #include "components/prefs/pref_service.h" | 17 #include "components/prefs/pref_service.h" |
| 17 #include "ios/chrome/browser/bookmarks/bookmark_model_factory.h" | 18 #include "ios/chrome/browser/bookmarks/bookmark_model_factory.h" |
| 18 #include "ios/chrome/browser/browser_state/browser_state_otr_helper.h" | 19 #include "ios/chrome/browser/browser_state/browser_state_otr_helper.h" |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 HistoryServiceFactory::HistoryServiceFactory() | 61 HistoryServiceFactory::HistoryServiceFactory() |
| 61 : BrowserStateKeyedServiceFactory( | 62 : BrowserStateKeyedServiceFactory( |
| 62 "HistoryService", | 63 "HistoryService", |
| 63 BrowserStateDependencyManager::GetInstance()) { | 64 BrowserStateDependencyManager::GetInstance()) { |
| 64 DependsOn(ios::BookmarkModelFactory::GetInstance()); | 65 DependsOn(ios::BookmarkModelFactory::GetInstance()); |
| 65 } | 66 } |
| 66 | 67 |
| 67 HistoryServiceFactory::~HistoryServiceFactory() { | 68 HistoryServiceFactory::~HistoryServiceFactory() { |
| 68 } | 69 } |
| 69 | 70 |
| 70 scoped_ptr<KeyedService> HistoryServiceFactory::BuildServiceInstanceFor( | 71 std::unique_ptr<KeyedService> HistoryServiceFactory::BuildServiceInstanceFor( |
| 71 web::BrowserState* context) const { | 72 web::BrowserState* context) const { |
| 72 ios::ChromeBrowserState* browser_state = | 73 ios::ChromeBrowserState* browser_state = |
| 73 ios::ChromeBrowserState::FromBrowserState(context); | 74 ios::ChromeBrowserState::FromBrowserState(context); |
| 74 scoped_ptr<history::HistoryService> history_service( | 75 std::unique_ptr<history::HistoryService> history_service( |
| 75 new history::HistoryService( | 76 new history::HistoryService( |
| 76 make_scoped_ptr(new HistoryClientImpl( | 77 base::WrapUnique(new HistoryClientImpl( |
| 77 ios::BookmarkModelFactory::GetForBrowserState(browser_state))), | 78 ios::BookmarkModelFactory::GetForBrowserState(browser_state))), |
| 78 nullptr)); | 79 nullptr)); |
| 79 if (!history_service->Init(history::HistoryDatabaseParamsForPath( | 80 if (!history_service->Init(history::HistoryDatabaseParamsForPath( |
| 80 browser_state->GetStatePath()))) { | 81 browser_state->GetStatePath()))) { |
| 81 return nullptr; | 82 return nullptr; |
| 82 } | 83 } |
| 83 return std::move(history_service); | 84 return std::move(history_service); |
| 84 } | 85 } |
| 85 | 86 |
| 86 web::BrowserState* HistoryServiceFactory::GetBrowserStateToUse( | 87 web::BrowserState* HistoryServiceFactory::GetBrowserStateToUse( |
| 87 web::BrowserState* context) const { | 88 web::BrowserState* context) const { |
| 88 return GetBrowserStateRedirectedInIncognito(context); | 89 return GetBrowserStateRedirectedInIncognito(context); |
| 89 } | 90 } |
| 90 | 91 |
| 91 bool HistoryServiceFactory::ServiceIsNULLWhileTesting() const { | 92 bool HistoryServiceFactory::ServiceIsNULLWhileTesting() const { |
| 92 return true; | 93 return true; |
| 93 } | 94 } |
| 94 | 95 |
| 95 } // namespace ios | 96 } // namespace ios |
| OLD | NEW |