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

Unified Diff: chrome/browser/autocomplete/autocomplete_classifier_factory.cc

Issue 1165913002: [Cleanup] Used scoped pointers in KeyedServiceFactory's SetTestingFactory functions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Finish renaming profile -> context Created 5 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/autocomplete/autocomplete_classifier_factory.cc
diff --git a/chrome/browser/autocomplete/autocomplete_classifier_factory.cc b/chrome/browser/autocomplete/autocomplete_classifier_factory.cc
index 28c760166088ac153e85cebd9d0b11c56b565e40..d6458e9b766b792f4489ecb51220848a247eccef 100644
--- a/chrome/browser/autocomplete/autocomplete_classifier_factory.cc
+++ b/chrome/browser/autocomplete/autocomplete_classifier_factory.cc
@@ -32,15 +32,15 @@ AutocompleteClassifierFactory* AutocompleteClassifierFactory::GetInstance() {
}
// static
-KeyedService* AutocompleteClassifierFactory::BuildInstanceFor(
+scoped_ptr<KeyedService> AutocompleteClassifierFactory::BuildInstanceFor(
content::BrowserContext* context) {
Profile* profile = static_cast<Profile*>(context);
- return new AutocompleteClassifier(
+ return make_scoped_ptr(new AutocompleteClassifier(
make_scoped_ptr(new AutocompleteController(
profile, TemplateURLServiceFactory::GetForProfile(profile), NULL,
AutocompleteClassifier::kDefaultOmniboxProviders)),
scoped_ptr<AutocompleteSchemeClassifier>(
- new ChromeAutocompleteSchemeClassifier(profile)));
+ new ChromeAutocompleteSchemeClassifier(profile))));
}
AutocompleteClassifierFactory::AutocompleteClassifierFactory()
@@ -72,5 +72,5 @@ bool AutocompleteClassifierFactory::ServiceIsNULLWhileTesting() const {
KeyedService* AutocompleteClassifierFactory::BuildServiceInstanceFor(
content::BrowserContext* profile) const {
- return BuildInstanceFor(static_cast<Profile*>(profile));
+ return BuildInstanceFor(static_cast<Profile*>(profile)).release();
}

Powered by Google App Engine
This is Rietveld 408576698