Move most TemplateURL data members to a new struct, TemplateURLData. This allows us to eliminate t…

chrome/browser/search_engines/search_host_to_urls_map_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 "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/search_engines/search_host_to_urls_map.h"
 #include "chrome/browser/search_engines/search_terms_data.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 11 matching lines @@
   scoped_ptr<SearchHostToURLsMap> provider_map_;
   scoped_ptr<TemplateURL> t_urls_[2];
   std::string host_;
 
   DISALLOW_COPY_AND_ASSIGN(SearchHostToURLsMapTest);
 };
 
 void SearchHostToURLsMapTest::SetUp() {
   // Add some entries to the search host map.
   host_ = "www.unittest.com";
-  t_urls_[0].reset(new TemplateURL());
-  t_urls_[0]->SetURL("http://" + host_ + "/path1");
-  t_urls_[1].reset(new TemplateURL());
-  t_urls_[1]->SetURL("http://" + host_ + "/path2");
-
+  TemplateURLData data;
+  data.SetURL("http://" + host_ + "/path1");
+  t_urls_[0].reset(new TemplateURL(data));
+  data.SetURL("http://" + host_ + "/path2");
+  t_urls_[1].reset(new TemplateURL(data));
   std::vector<const TemplateURL*> template_urls;
   template_urls.push_back(t_urls_[0].get());
   template_urls.push_back(t_urls_[1].get());
 
   provider_map_.reset(new SearchHostToURLsMap);
   UIThreadSearchTermsData search_terms_data;
   provider_map_->Init(template_urls, search_terms_data);
 }
 
 TEST_F(SearchHostToURLsMapTest, Add) {
   std::string new_host = "example.com";
-  TemplateURL new_t_url;
-  new_t_url.SetURL("http://" + new_host + "/");
+  TemplateURLData data;
+  data.SetURL("http://" + new_host + "/");
+  TemplateURL new_t_url(data);
   UIThreadSearchTermsData search_terms_data;
   provider_map_->Add(&new_t_url, search_terms_data);
 
   ASSERT_EQ(&new_t_url, provider_map_->GetTemplateURLForHost(new_host));
 }
 
 TEST_F(SearchHostToURLsMapTest, Remove) {
   provider_map_->Remove(t_urls_[0].get());
 
   const TemplateURL* found_url = provider_map_->GetTemplateURLForHost(host_);
   ASSERT_EQ(t_urls_[1].get(), found_url);
 
   const TemplateURLSet* urls = provider_map_->GetURLsForHost(host_);
   ASSERT_TRUE(urls != NULL);
 
   int url_count = 0;
   for (TemplateURLSet::const_iterator i(urls->begin()); i != urls->end(); ++i) {
     url_count++;
     ASSERT_EQ(t_urls_[1].get(), *i);
   }
   ASSERT_EQ(1, url_count);
 }
 
-TEST_F(SearchHostToURLsMapTest, Update) {
-  std::string new_host = "example.com";
-  TemplateURL new_values;
-  new_values.SetURL("http://" + new_host + "/");
-
-  UIThreadSearchTermsData search_terms_data;
-  provider_map_->Update(t_urls_[0].get(), new_values, search_terms_data);
-
-  ASSERT_EQ(t_urls_[0].get(), provider_map_->GetTemplateURLForHost(new_host));
-  ASSERT_EQ(t_urls_[1].get(), provider_map_->GetTemplateURLForHost(host_));
-}
-
 TEST_F(SearchHostToURLsMapTest, UpdateGoogleBaseURLs) {
   UIThreadSearchTermsData search_terms_data;
   std::string google_base_url = "google.com";
   search_terms_data.SetGoogleBaseURL(
       new std::string("http://" + google_base_url +"/"));
 
   // Add in a url with the templated Google base url.
-  TemplateURL new_t_url;
-  new_t_url.SetURL("{google:baseURL}?q={searchTerms}");
+  TemplateURLData data;
+  data.SetURL("{google:baseURL}?q={searchTerms}");
+  TemplateURL new_t_url(data);
   provider_map_->Add(&new_t_url, search_terms_data);
   ASSERT_EQ(&new_t_url, provider_map_->GetTemplateURLForHost(google_base_url));
 
   // Now change the Google base url and verify the result.
   std::string new_google_base_url = "google.co.uk";
   search_terms_data.SetGoogleBaseURL(
       new std::string("http://" + new_google_base_url +"/"));
   provider_map_->UpdateGoogleBaseURLs(search_terms_data);
   ASSERT_EQ(&new_t_url, provider_map_->GetTemplateURLForHost(
       new_google_base_url));
@@ skipping 29 matching lines @@
 
   for (size_t i = 0; i < arraysize(found_urls); ++i)
     ASSERT_TRUE(found_urls[i]);
 }
 
 TEST_F(SearchHostToURLsMapTest, GetURLsForUnknownHost) {
   const SearchHostToURLsMap::TemplateURLSet* urls =
       provider_map_->GetURLsForHost("a" + host_);
   ASSERT_TRUE(urls == NULL);
 }