| 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/ptr_util.h" |
| 10 #include "base/memory/singleton.h" | 10 #include "base/memory/singleton.h" |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 74 ios::ChromeBrowserState::FromBrowserState(context); | 74 ios::ChromeBrowserState::FromBrowserState(context); |
| 75 std::unique_ptr<history::HistoryService> history_service( | 75 std::unique_ptr<history::HistoryService> history_service( |
| 76 new history::HistoryService( | 76 new history::HistoryService( |
| 77 base::MakeUnique<HistoryClientImpl>( | 77 base::MakeUnique<HistoryClientImpl>( |
| 78 ios::BookmarkModelFactory::GetForBrowserState(browser_state)), | 78 ios::BookmarkModelFactory::GetForBrowserState(browser_state)), |
| 79 nullptr)); | 79 nullptr)); |
| 80 if (!history_service->Init(history::HistoryDatabaseParamsForPath( | 80 if (!history_service->Init(history::HistoryDatabaseParamsForPath( |
| 81 browser_state->GetStatePath()))) { | 81 browser_state->GetStatePath()))) { |
| 82 return nullptr; | 82 return nullptr; |
| 83 } | 83 } |
| 84 // TODO(crbug.com/703565): remove std::move() once Xcode 9.0+ is required. |
| 84 return std::move(history_service); | 85 return std::move(history_service); |
| 85 } | 86 } |
| 86 | 87 |
| 87 web::BrowserState* HistoryServiceFactory::GetBrowserStateToUse( | 88 web::BrowserState* HistoryServiceFactory::GetBrowserStateToUse( |
| 88 web::BrowserState* context) const { | 89 web::BrowserState* context) const { |
| 89 return GetBrowserStateRedirectedInIncognito(context); | 90 return GetBrowserStateRedirectedInIncognito(context); |
| 90 } | 91 } |
| 91 | 92 |
| 92 bool HistoryServiceFactory::ServiceIsNULLWhileTesting() const { | 93 bool HistoryServiceFactory::ServiceIsNULLWhileTesting() const { |
| 93 return true; | 94 return true; |
| 94 } | 95 } |
| 95 | 96 |
| 96 } // namespace ios | 97 } // namespace ios |
| OLD | NEW |