| Index: chrome/browser/profile_resetter/profile_resetter_unittest.cc
|
| diff --git a/chrome/browser/profile_resetter/profile_resetter_unittest.cc b/chrome/browser/profile_resetter/profile_resetter_unittest.cc
|
| index cb56e114e3e44f69d4075613823d69d8c5052644..6d255a56ffe7e151e45335dfac0307012630d55a 100644
|
| --- a/chrome/browser/profile_resetter/profile_resetter_unittest.cc
|
| +++ b/chrome/browser/profile_resetter/profile_resetter_unittest.cc
|
| @@ -5,6 +5,7 @@
|
| #include "chrome/browser/profile_resetter/profile_resetter.h"
|
|
|
| #include "base/json/json_string_value_serializer.h"
|
| +#include "base/memory/scoped_ptr.h"
|
| #include "base/prefs/pref_service.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "base/test/scoped_path_override.h"
|
| @@ -107,7 +108,7 @@ class ProfileResetterTest : public extensions::ExtensionServiceTestBase,
|
|
|
| TestingProfile* profile() { return profile_.get(); }
|
|
|
| - static KeyedService* CreateTemplateURLService(
|
| + static scoped_ptr<KeyedService> CreateTemplateURLService(
|
| content::BrowserContext* context);
|
|
|
| private:
|
| @@ -144,15 +145,15 @@ void ProfileResetterTest::SetUp() {
|
| }
|
|
|
| // static
|
| -KeyedService* ProfileResetterTest::CreateTemplateURLService(
|
| +scoped_ptr<KeyedService> ProfileResetterTest::CreateTemplateURLService(
|
| content::BrowserContext* context) {
|
| Profile* profile = static_cast<Profile*>(context);
|
| - return new TemplateURLService(
|
| + return make_scoped_ptr(new TemplateURLService(
|
| profile->GetPrefs(),
|
| scoped_ptr<SearchTermsData>(new UIThreadSearchTermsData(profile)),
|
| WebDataServiceFactory::GetKeywordWebDataForProfile(
|
| profile, ServiceAccessType::EXPLICIT_ACCESS),
|
| - scoped_ptr<TemplateURLServiceClient>(), NULL, NULL, base::Closure());
|
| + scoped_ptr<TemplateURLServiceClient>(), NULL, NULL, base::Closure()));
|
| }
|
|
|
|
|
|
|