| 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 35b02b472a03a30e5663121e1612a8c19225c164..bb77313a37f933438f9bc77b49a24ff8529dc588 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,11 @@ 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);
|
| + TemplateURL* template_url = model->Add(base::MakeUnique<TemplateURL>(data));
|
| 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 +638,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[] = {
|
| @@ -1113,8 +1113,8 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, NonSubstitutingKeywordTest) {
|
| data.SetShortName(ASCIIToUTF16("Search abc"));
|
| data.SetKeyword(ASCIIToUTF16(kSearchText));
|
| data.SetURL("http://abc.com/{searchTerms}");
|
| - TemplateURL* template_url = new TemplateURL(data);
|
| - template_url_service->Add(template_url);
|
| + TemplateURL* template_url =
|
| + template_url_service->Add(base::MakeUnique<TemplateURL>(data));
|
|
|
| omnibox_view->SetUserText(base::string16());
|
|
|
| @@ -1137,7 +1137,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));
|
|
|