Reland r131019: Move most TemplateURL data members to a new struct, TemplateURLData. This allows us…

chrome/browser/ui/omnibox/omnibox_view_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stdio.h>
 
 #include "base/message_loop.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/time.h"
@@ skipping 267 matching lines @@
 
     ASSERT_TRUE(model->loaded());
     // Remove built-in template urls, like google.com, bing.com etc., as they
     // may appear as autocomplete suggests and interfere with our tests.
     model->SetDefaultSearchProvider(NULL);
     TemplateURLService::TemplateURLVector builtins = model->GetTemplateURLs();
     for (TemplateURLService::TemplateURLVector::const_iterator
          i = builtins.begin(); i != builtins.end(); ++i)
       model->Remove(*i);
 
-    TemplateURL* template_url = new TemplateURL();
-    template_url->SetURL(kSearchURL);
-    template_url->set_keyword(ASCIIToUTF16(kSearchKeyword));
-    template_url->set_short_name(ASCIIToUTF16(kSearchShortName));
+    TemplateURLData data;
+    data.short_name = ASCIIToUTF16(kSearchShortName);
+    data.SetKeyword(ASCIIToUTF16(kSearchKeyword));
+    data.SetURL(kSearchURL);
+    TemplateURL* template_url = new TemplateURL(data);
     model->Add(template_url);
     model->SetDefaultSearchProvider(template_url);
 
-    TemplateURL* second_url = new TemplateURL();
-    second_url->SetURL(kSearchURL);
-    second_url->set_keyword(ASCIIToUTF16(kSearchKeyword2));
-    second_url->set_short_name(ASCIIToUTF16(kSearchShortName));
-    model->Add(second_url);
+    data.SetKeyword(ASCIIToUTF16(kSearchKeyword2));
+    model->Add(new TemplateURL(data));
   }
 
   void AddHistoryEntry(const TestHistoryEntry& entry, const Time& time) {
     Profile* profile = browser()->profile();
     HistoryService* history_service =
         profile->GetHistoryService(Profile::EXPLICIT_ACCESS);
     ASSERT_TRUE(history_service);
 
     if (!history_service->BackendLoaded()) {
       content::NotificationRegistrar registrar;
@@ skipping 628 matching lines @@
   void NonSubstitutingKeywordTest() {
     OmniboxView* omnibox_view = NULL;
     ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
     AutocompletePopupModel* popup_model = omnibox_view->model()->popup_model();
     ASSERT_TRUE(popup_model);
 
     TemplateURLService* template_url_service =
         TemplateURLServiceFactory::GetForProfile(browser()->profile());
 
     // Add a non-default substituting keyword.
-    TemplateURL* template_url = new TemplateURL();
-    template_url->SetURL("http://abc.com/{searchTerms}");
-    template_url->set_keyword(UTF8ToUTF16(kSearchText));
-    template_url->set_short_name(UTF8ToUTF16("Search abc"));
+    TemplateURLData data;
+    data.short_name = 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);
 
     omnibox_view->SetUserText(string16());
 
     // Non-default substituting keyword shouldn't be matched by default.
     ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchTextKeys));
     ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
     ASSERT_TRUE(popup_model->IsOpen());
 
     // Check if the default match result is Search Primary Provider.
     ASSERT_EQ(AutocompleteMatch::SEARCH_WHAT_YOU_TYPED,
               popup_model->result().default_match()->type);
     ASSERT_EQ(kSearchTextURL,
               popup_model->result().default_match()->destination_url.spec());
 
     omnibox_view->SetUserText(string16());
     ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
     ASSERT_FALSE(popup_model->IsOpen());
 
     // Try a non-substituting keyword.
     template_url_service->Remove(template_url);
-    template_url = new TemplateURL();
-    template_url->SetURL("http://abc.com/");
-    template_url->set_keyword(UTF8ToUTF16(kSearchText));
-    template_url->set_short_name(UTF8ToUTF16("abc"));
-    template_url_service->Add(template_url);
+    data.short_name = ASCIIToUTF16("abc");
+    data.SetURL("http://abc.com/");
+    template_url_service->Add(new TemplateURL(data));
 
     // We always allow exact matches for non-substituting keywords.
     ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchTextKeys));
     ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
     ASSERT_TRUE(popup_model->IsOpen());
     ASSERT_EQ(AutocompleteMatch::HISTORY_KEYWORD,
               popup_model->result().default_match()->type);
     ASSERT_EQ("http://abc.com/",
               popup_model->result().default_match()->destination_url.spec());
   }
@@ skipping 489 matching lines @@
 
   // Paste text.
   ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_V, ui::EF_CONTROL_DOWN));
   ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
   ASSERT_TRUE(popup_model->IsOpen());
 
   // Inline autocomplete shouldn't be triggered.
   ASSERT_EQ(ASCIIToUTF16("abc"), omnibox_view->GetText());
 }
 #endif