Index: ios/chrome/browser/autocomplete/autocomplete_classifier_factory.cc |
diff --git a/ios/chrome/browser/autocomplete/autocomplete_classifier_factory.cc b/ios/chrome/browser/autocomplete/autocomplete_classifier_factory.cc |
index 22dc1e35bb52cffdeeedaafb626340982402af37..e1c429b4baee2bbb29c62dce6a2b2b99ada6872b 100644 |
--- a/ios/chrome/browser/autocomplete/autocomplete_classifier_factory.cc |
+++ b/ios/chrome/browser/autocomplete/autocomplete_classifier_factory.cc |
@@ -4,6 +4,7 @@ |
#include "ios/chrome/browser/autocomplete/autocomplete_classifier_factory.h" |
+#include "base/memory/ptr_util.h" |
#include "base/memory/singleton.h" |
#include "components/keyed_service/ios/browser_state_dependency_manager.h" |
#include "components/omnibox/browser/autocomplete_classifier.h" |
@@ -19,15 +20,15 @@ |
namespace ios { |
namespace { |
-scoped_ptr<KeyedService> BuildAutocompleteClassifier( |
+std::unique_ptr<KeyedService> BuildAutocompleteClassifier( |
web::BrowserState* context) { |
ios::ChromeBrowserState* browser_state = |
ios::ChromeBrowserState::FromBrowserState(context); |
- return make_scoped_ptr(new AutocompleteClassifier( |
- make_scoped_ptr(new AutocompleteController( |
- make_scoped_ptr(new AutocompleteProviderClientImpl(browser_state)), |
+ return base::WrapUnique(new AutocompleteClassifier( |
+ base::WrapUnique(new AutocompleteController( |
+ base::WrapUnique(new AutocompleteProviderClientImpl(browser_state)), |
nullptr, AutocompleteClassifier::kDefaultOmniboxProviders)), |
- make_scoped_ptr(new AutocompleteSchemeClassifierImpl))); |
+ base::WrapUnique(new AutocompleteSchemeClassifierImpl))); |
} |
} // namespace |
@@ -61,7 +62,8 @@ AutocompleteClassifierFactory::AutocompleteClassifierFactory() |
AutocompleteClassifierFactory::~AutocompleteClassifierFactory() {} |
-scoped_ptr<KeyedService> AutocompleteClassifierFactory::BuildServiceInstanceFor( |
+std::unique_ptr<KeyedService> |
+AutocompleteClassifierFactory::BuildServiceInstanceFor( |
web::BrowserState* context) const { |
return BuildAutocompleteClassifier(context); |
} |