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

chrome/browser/instant/instant_browsertest.cc

Index: chrome/browser/instant/instant_browsertest.cc
===================================================================
--- chrome/browser/instant/instant_browsertest.cc	(revision 131175)
+++ chrome/browser/instant/instant_browsertest.cc	(working copy)
@@ -68,19 +68,15 @@
       observer.Wait();
     }
 
+    TemplateURLData data;
+    data.short_name = ASCIIToUTF16("foo");
+    data.SetKeyword(ASCIIToUTF16("foo"));
+    data.SetURL(base::StringPrintf("http://%s:%d/files/%s?q={searchTerms}",
+        test_server()->host_port_pair().host().c_str(),
+        test_server()->host_port_pair().port(), page.c_str()));
+    data.instant_url = data.url();
     // TemplateURLService takes ownership of this.
-    TemplateURL* template_url = new TemplateURL();
-
-    std::string url = base::StringPrintf(
-        "http://%s:%d/files/%s?q={searchTerms}",
-        test_server()->host_port_pair().host().c_str(),
-        test_server()->host_port_pair().port(),
-        page.c_str());
-    template_url->SetURL(url);
-    template_url->SetInstantURL(url);
-    template_url->set_keyword(ASCIIToUTF16("foo"));
-    template_url->set_short_name(ASCIIToUTF16("foo"));
-
+    TemplateURL* template_url = new TemplateURL(data);
     model->Add(template_url);
     model->SetDefaultSearchProvider(template_url);
   }