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

chrome/browser/instant/instant_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 "base/command_line.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
@@ skipping 50 matching lines @@
         TemplateURLServiceFactory::GetForProfile(browser()->profile());
 
     ui_test_utils::WindowedNotificationObserver observer(
         chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED,
         content::NotificationService::AllSources());
     if (!model->loaded()) {
       model->Load();
       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);
   }
 
   // Type a character to get instant to trigger and determine instant support.
   void DetermineInstantSupport() {
     ui_test_utils::WindowedNotificationObserver observer(
         chrome::NOTIFICATION_INSTANT_SUPPORT_DETERMINED,
         content::NotificationService::AllSources());
     // "a" triggers the "about:" provider. "b" begins the "bing.com" keyword.
@@ skipping 906 matching lines @@
   // Press <Enter> in the omnibox, causing the preview to be committed.
   WebContents* preview_tab = preview()->web_contents();
   ASSERT_TRUE(PressEnter());
 
   // The preview contents should now be the active tab contents.
   EXPECT_FALSE(preview());
   EXPECT_FALSE(instant()->is_displayable());
   EXPECT_FALSE(instant()->IsCurrent());
   EXPECT_EQ(preview_tab, browser()->GetSelectedWebContents());
 }