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

chrome/browser/search_engines/search_provider_install_data_unittest.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 <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
@@ skipping 214 matching lines @@
   service->SetManagedPref(prefs::kDefaultSearchProviderPrepopulateID,
                           new StringValue(std::string()));
   util_.model()->Observe(chrome::NOTIFICATION_PREF_CHANGED,
       content::Source<PrefService>(util_.profile()->GetTestingPrefService()),
       content::Details<std::string>(NULL));
 }
 
 TemplateURL* SearchProviderInstallDataTest::AddNewTemplateURL(
     const std::string& url,
     const string16& keyword) {
-  TemplateURL* t_url = new TemplateURL();
-  t_url->set_short_name(keyword);
-  t_url->set_keyword(keyword);
-  t_url->SetURL(url);
+  TemplateURLData data;
+  data.short_name = keyword;
+  data.SetKeyword(keyword);
+  data.SetURL(url);
+  TemplateURL* t_url = new TemplateURL(data);
   util_.model()->Add(t_url);
   return t_url;
 }
 
 
 // Actual tests ---------------------------------------------------------------
 
 TEST_F(SearchProviderInstallDataTest, GetInstallState) {
   // Set up the database.
   util_.ChangeModelToLoadState();
@@ skipping 70 matching lines @@
   // Change the Google base url.
   google_host = "foo.com";
   util_.SetGoogleBaseURL("http://" + google_host + "/");
   // Wait for the I/O thread to process the update notification.
   TemplateURLServiceTestUtil::BlockTillIOThreadProcessesRequests();
 
   // Verify that the change got picked up.
   test_get_install_state->set_search_provider_host(google_host);
   EXPECT_TRUE(test_get_install_state->RunTests());
 }