| Index: chrome/browser/autocomplete/search_provider_unittest.cc
|
| diff --git a/chrome/browser/autocomplete/search_provider_unittest.cc b/chrome/browser/autocomplete/search_provider_unittest.cc
|
| index ebf9ea74f3f0d620b55716385c9b3f5562edb563..b748efedf00d10171f8cb74ae8418bf084721479 100644
|
| --- a/chrome/browser/autocomplete/search_provider_unittest.cc
|
| +++ b/chrome/browser/autocomplete/search_provider_unittest.cc
|
| @@ -285,8 +285,7 @@ void SearchProviderTest::SetUp() {
|
| data.suggestions_url = "http://defaultturl2/{searchTerms}";
|
| data.instant_url = "http://does/not/exist?strk=1";
|
| data.search_terms_replacement_key = "strk";
|
| - default_t_url_ = new TemplateURL(data);
|
| - turl_model->Add(default_t_url_);
|
| + default_t_url_ = turl_model->Add(base::MakeUnique<TemplateURL>(data));
|
| turl_model->SetUserSelectedDefaultSearchProvider(default_t_url_);
|
| TemplateURLID default_provider_id = default_t_url_->id();
|
| ASSERT_NE(0, default_provider_id);
|
| @@ -299,8 +298,7 @@ void SearchProviderTest::SetUp() {
|
| data.SetKeyword(ASCIIToUTF16("k"));
|
| data.SetURL("http://keyword/{searchTerms}");
|
| data.suggestions_url = "http://suggest_keyword/{searchTerms}";
|
| - keyword_t_url_ = new TemplateURL(data);
|
| - turl_model->Add(keyword_t_url_);
|
| + keyword_t_url_ = turl_model->Add(base::MakeUnique<TemplateURL>(data));
|
| ASSERT_NE(0, keyword_t_url_->id());
|
|
|
| // Add a page and search term for keyword_t_url_.
|
| @@ -1161,8 +1159,7 @@ TEST_F(SearchProviderTest, CommandLineOverrides) {
|
| data.SetShortName(ASCIIToUTF16("default"));
|
| data.SetKeyword(data.short_name());
|
| data.SetURL("{google:baseURL}{searchTerms}");
|
| - default_t_url_ = new TemplateURL(data);
|
| - turl_model->Add(default_t_url_);
|
| + default_t_url_ = turl_model->Add(base::MakeUnique<TemplateURL>(data));
|
| turl_model->SetUserSelectedDefaultSearchProvider(default_t_url_);
|
|
|
| base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
|
| @@ -3382,8 +3379,7 @@ TEST_F(SearchProviderTest, SuggestQueryUsesToken) {
|
| data.SetURL("http://example/{searchTerms}{google:sessionToken}");
|
| data.suggestions_url =
|
| "http://suggest/?q={searchTerms}&{google:sessionToken}";
|
| - default_t_url_ = new TemplateURL(data);
|
| - turl_model->Add(default_t_url_);
|
| + default_t_url_ = turl_model->Add(base::MakeUnique<TemplateURL>(data));
|
| turl_model->SetUserSelectedDefaultSearchProvider(default_t_url_);
|
|
|
| base::string16 term = term1_.substr(0, term1_.length() - 1);
|
|
|