Index: chrome/browser/ui/omnibox/omnibox_view_browsertest.cc |
diff --git a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc |
index 9fea9c01e11f66a79c67f239a1befb7f7444a6c9..5ab65f09a0e182b258b551b313eff41f8e486779 100644 |
--- a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc |
+++ b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc |
@@ -7,6 +7,7 @@ |
#include "base/command_line.h" |
#include "base/macros.h" |
+#include "base/memory/ptr_util.h" |
#include "base/scoped_observer.h" |
#include "base/strings/string16.h" |
#include "base/strings/string_util.h" |
@@ -275,12 +276,14 @@ class OmniboxViewTest : public InProcessBrowserTest, |
data.SetShortName(ASCIIToUTF16(kSearchShortName)); |
data.SetKeyword(ASCIIToUTF16(kSearchKeyword)); |
data.SetURL(kSearchURL); |
- TemplateURL* template_url = new TemplateURL(data); |
- model->Add(template_url); |
+ std::unique_ptr<TemplateURL> template_url_ptr = |
+ base::MakeUnique<TemplateURL>(data); |
+ TemplateURL* template_url = template_url_ptr.get(); |
+ model->Add(std::move(template_url_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
fixed
|
model->SetUserSelectedDefaultSearchProvider(template_url); |
data.SetKeyword(ASCIIToUTF16(kSearchKeyword2)); |
- model->Add(new TemplateURL(data)); |
+ model->Add(base::MakeUnique<TemplateURL>(data)); |
// Remove built-in template urls, like google.com, bing.com etc., as they |
// may appear as autocomplete suggests and interfere with our tests. |
@@ -638,7 +641,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_DesiredTLDWithTemporaryText) { |
data.SetShortName(ASCIIToUTF16("abc")); |
data.SetKeyword(ASCIIToUTF16(kSearchText)); |
data.SetURL("http://abc.com/"); |
- template_url_service->Add(new TemplateURL(data)); |
+ template_url_service->Add(base::MakeUnique<TemplateURL>(data)); |
// Send "ab", so that an "abc" entry appears in the popup. |
const ui::KeyboardCode kSearchTextPrefixKeys[] = { |
@@ -1114,7 +1117,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, NonSubstitutingKeywordTest) { |
data.SetKeyword(ASCIIToUTF16(kSearchText)); |
data.SetURL("http://abc.com/{searchTerms}"); |
TemplateURL* template_url = new TemplateURL(data); |
- template_url_service->Add(template_url); |
+ template_url_service->Add(base::WrapUnique(template_url)); |
omnibox_view->SetUserText(base::string16()); |
@@ -1137,7 +1140,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, NonSubstitutingKeywordTest) { |
template_url_service->Remove(template_url); |
data.SetShortName(ASCIIToUTF16("abc")); |
data.SetURL("http://abc.com/"); |
- template_url_service->Add(new TemplateURL(data)); |
+ template_url_service->Add(base::MakeUnique<TemplateURL>(data)); |
// We always allow exact matches for non-substituting keywords. |
ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchTextKeys)); |