Index: components/omnibox/browser/autocomplete_provider_unittest.cc |
diff --git a/components/omnibox/browser/autocomplete_provider_unittest.cc b/components/omnibox/browser/autocomplete_provider_unittest.cc |
index 93b8c837509a9135879e015424e4d6ba2228b20a..a5881e15364f8a943b03e9db6dd3006fef628872 100644 |
--- a/components/omnibox/browser/autocomplete_provider_unittest.cc |
+++ b/components/omnibox/browser/autocomplete_provider_unittest.cc |
@@ -302,12 +302,14 @@ void AutocompleteProviderTest::RegisterTemplateURL( |
data.SetURL(template_url); |
data.SetShortName(keyword); |
data.SetKeyword(keyword); |
- TemplateURL* default_t_url = new TemplateURL(data); |
+ std::unique_ptr<TemplateURL> default_turl_ptr = |
+ base::MakeUnique<TemplateURL>(data); |
+ TemplateURL* default_turl = default_turl_ptr.get(); |
TemplateURLService* turl_model = client_->GetTemplateURLService(); |
- turl_model->Add(default_t_url); |
- turl_model->SetUserSelectedDefaultSearchProvider(default_t_url); |
+ turl_model->Add(std::move(default_turl_ptr)); |
Peter Kasting
2016/08/31 04:12:56
Nit: Just use the old code and add a WrapUnique()
Avi (use Gerrit)
2016/09/01 00:34:26
Done.
|
+ turl_model->SetUserSelectedDefaultSearchProvider(default_turl); |
turl_model->Load(); |
- TemplateURLID default_provider_id = default_t_url->id(); |
+ TemplateURLID default_provider_id = default_turl->id(); |
ASSERT_NE(0, default_provider_id); |
} |
@@ -367,11 +369,13 @@ void AutocompleteProviderTest::ResetControllerWithKeywordAndSearchProviders() { |
data.SetShortName(base::ASCIIToUTF16("default")); |
data.SetKeyword(base::ASCIIToUTF16("default")); |
data.SetURL("http://defaultturl/{searchTerms}"); |
- TemplateURL* default_t_url = new TemplateURL(data); |
+ std::unique_ptr<TemplateURL> default_turl_ptr = |
+ base::MakeUnique<TemplateURL>(data); |
+ TemplateURL* default_turl = default_turl_ptr.get(); |
TemplateURLService* turl_model = client_->GetTemplateURLService(); |
- turl_model->Add(default_t_url); |
- turl_model->SetUserSelectedDefaultSearchProvider(default_t_url); |
- TemplateURLID default_provider_id = default_t_url->id(); |
+ turl_model->Add(std::move(default_turl_ptr)); |
Peter Kasting
2016/08/31 04:12:56
Nit: Just use the old code and add a WrapUnique()
Avi (use Gerrit)
2016/09/01 00:34:26
Done.
|
+ turl_model->SetUserSelectedDefaultSearchProvider(default_turl); |
+ TemplateURLID default_provider_id = default_turl->id(); |
ASSERT_NE(0, default_provider_id); |
// Create another TemplateURL for KeywordProvider. |
@@ -379,9 +383,11 @@ void AutocompleteProviderTest::ResetControllerWithKeywordAndSearchProviders() { |
data2.SetShortName(base::ASCIIToUTF16("k")); |
data2.SetKeyword(base::ASCIIToUTF16("k")); |
data2.SetURL("http://keyword/{searchTerms}"); |
- TemplateURL* keyword_t_url = new TemplateURL(data2); |
- turl_model->Add(keyword_t_url); |
- ASSERT_NE(0, keyword_t_url->id()); |
+ std::unique_ptr<TemplateURL> keyword_turl_ptr = |
+ base::MakeUnique<TemplateURL>(data2); |
+ TemplateURL* keyword_turl = keyword_turl_ptr.get(); |
+ turl_model->Add(std::move(keyword_turl_ptr)); |
+ ASSERT_NE(0, keyword_turl->id()); |
ResetControllerWithType(AutocompleteProvider::TYPE_KEYWORD | |
AutocompleteProvider::TYPE_SEARCH); |
@@ -395,26 +401,30 @@ void AutocompleteProviderTest::ResetControllerWithKeywordProvider() { |
data.SetShortName(base::ASCIIToUTF16("foo.com")); |
data.SetKeyword(base::ASCIIToUTF16("foo.com")); |
data.SetURL("http://foo.com/{searchTerms}"); |
- TemplateURL* keyword_t_url = new TemplateURL(data); |
- turl_model->Add(keyword_t_url); |
- ASSERT_NE(0, keyword_t_url->id()); |
+ std::unique_ptr<TemplateURL> keyword_turl_ptr = |
+ base::MakeUnique<TemplateURL>(data); |
+ TemplateURL* keyword_turl = keyword_turl_ptr.get(); |
+ turl_model->Add(std::move(keyword_turl_ptr)); |
Peter Kasting
2016/08/31 04:12:56
Nit: Just use the old code and add a WrapUnique()
Avi (use Gerrit)
2016/09/01 00:34:26
Done.
|
+ ASSERT_NE(0, keyword_turl->id()); |
// Make a TemplateURL for KeywordProvider that a shorter version of the |
// first. |
data.SetShortName(base::ASCIIToUTF16("f")); |
data.SetKeyword(base::ASCIIToUTF16("f")); |
data.SetURL("http://f.com/{searchTerms}"); |
- keyword_t_url = new TemplateURL(data); |
- turl_model->Add(keyword_t_url); |
- ASSERT_NE(0, keyword_t_url->id()); |
+ keyword_turl_ptr = base::MakeUnique<TemplateURL>(data); |
+ keyword_turl = keyword_turl_ptr.get(); |
+ turl_model->Add(std::move(keyword_turl_ptr)); |
Peter Kasting
2016/08/31 04:12:56
Nit: Just use the old code and add a WrapUnique()
Avi (use Gerrit)
2016/09/01 00:34:26
Done.
|
+ ASSERT_NE(0, keyword_turl->id()); |
// Create another TemplateURL for KeywordProvider. |
data.SetShortName(base::ASCIIToUTF16("bar.com")); |
data.SetKeyword(base::ASCIIToUTF16("bar.com")); |
data.SetURL("http://bar.com/{searchTerms}"); |
- keyword_t_url = new TemplateURL(data); |
- turl_model->Add(keyword_t_url); |
- ASSERT_NE(0, keyword_t_url->id()); |
+ keyword_turl_ptr = base::MakeUnique<TemplateURL>(data); |
+ keyword_turl = keyword_turl_ptr.get(); |
+ turl_model->Add(std::move(keyword_turl_ptr)); |
Peter Kasting
2016/08/31 04:12:56
Nit: Just use the old code and add a WrapUnique()
Avi (use Gerrit)
2016/09/01 00:34:26
Done.
|
+ ASSERT_NE(0, keyword_turl->id()); |
ResetControllerWithType(AutocompleteProvider::TYPE_KEYWORD); |
} |