Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(44)

Side by Side Diff: ios/chrome/browser/history/history_service_factory.cc

Issue 2256193002: Re-write many calls to WrapUnique() with MakeUnique() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 67
68 HistoryServiceFactory::~HistoryServiceFactory() { 68 HistoryServiceFactory::~HistoryServiceFactory() {
69 } 69 }
70 70
71 std::unique_ptr<KeyedService> HistoryServiceFactory::BuildServiceInstanceFor( 71 std::unique_ptr<KeyedService> HistoryServiceFactory::BuildServiceInstanceFor(
72 web::BrowserState* context) const { 72 web::BrowserState* context) const {
73 ios::ChromeBrowserState* browser_state = 73 ios::ChromeBrowserState* browser_state =
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::WrapUnique(new 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 return std::move(history_service); 84 return std::move(history_service);
85 } 85 }
86 86
87 web::BrowserState* HistoryServiceFactory::GetBrowserStateToUse( 87 web::BrowserState* HistoryServiceFactory::GetBrowserStateToUse(
88 web::BrowserState* context) const { 88 web::BrowserState* context) const {
89 return GetBrowserStateRedirectedInIncognito(context); 89 return GetBrowserStateRedirectedInIncognito(context);
90 } 90 }
91 91
92 bool HistoryServiceFactory::ServiceIsNULLWhileTesting() const { 92 bool HistoryServiceFactory::ServiceIsNULLWhileTesting() const {
93 return true; 93 return true;
94 } 94 }
95 95
96 } // namespace ios 96 } // namespace ios
OLDNEW
« no previous file with comments | « ios/chrome/browser/history/history_client_impl.cc ('k') | ios/chrome/browser/history/web_history_service_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698