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

chrome/browser/protector/default_search_provider_change_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/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/protector/histograms.h"
 #include "chrome/browser/protector/mock_protector_service.h"
@@ skipping 22 matching lines @@
 
 const string16 example_info = ASCIIToUTF16("Example.info");
 const string16 example_info_long = ASCIIToUTF16("ExampleSearchEngine.info");
 const std::string http_example_info = "http://example.info/%s";
 const string16 example_com = ASCIIToUTF16("Example.com");
 const string16 example_com_long = ASCIIToUTF16("ExampleSearchEngine.com");
 const std::string http_example_com = "http://example.com/%s";
 const string16 example_net = ASCIIToUTF16("Example.net");
 const std::string http_example_net = "http://example.net/%s";
 
+// Convenience function.
+TemplateURL* MakeTemplateURL(const string16& short_name,
+                             const string16& keyword,
+                             const std::string& url) {
+  TemplateURLData data;
+  data.short_name = short_name;
+  if (keyword.empty())
+    data.SetAutogenerateKeyword(true);
+  else
+    data.SetKeyword(keyword);
+  data.SetURL(url);
+  return new TemplateURL(data);
+}
+
 };
 
 class DefaultSearchProviderChangeTest : public InProcessBrowserTest {
  public:
   virtual void SetUpOnMainThread() OVERRIDE {
     mock_protector_service_ =
         MockProtectorService::BuildForProfile(browser()->profile());
 
     // Ensure that TemplateURLService is loaded.
     turl_service_ =
         TemplateURLServiceFactory::GetForProfile(browser()->profile());
     ui_test_utils::WaitForTemplateURLServiceToLoad(turl_service_);
 
     prepopulated_url_.reset(
         TemplateURLPrepopulateData::GetPrepopulatedDefaultSearch(NULL));
   }
 
   virtual void CleanUpOnMainThread() OVERRIDE {
     EXPECT_CALL(*mock_protector_service_, Shutdown());
   }
 
-  TemplateURL* MakeTemplateURL(const string16& short_name,
-                               const string16& keyword,
-                               const std::string& search_url) {
-    TemplateURL* url = new TemplateURL;
-    url->set_short_name(short_name);
-    if (keyword.empty())
-      url->set_autogenerate_keyword(true);
-    else
-      url->set_keyword(keyword);
-    url->SetURL(search_url);
-    return url;
-  }
-
   const TemplateURL* FindTemplateURL(const std::string& search_url) {
     TemplateURLService::TemplateURLVector urls =
         turl_service_->GetTemplateURLs();
     for (TemplateURLService::TemplateURLVector::const_iterator
          it = urls.begin(); it != urls.end(); ++it) {
       if ((*it)->url() == search_url)
         return *it;
     }
     return NULL;
   }
 
-  // Adds a copy of |turl| that will be owned by TemplateURLService.
-  void AddCopy(TemplateURL* turl) {
-    TemplateURL* turl_copy = new TemplateURL(*turl);
-    turl_service_->Add(turl_copy);
-  }
-
   void AddAndSetDefault(TemplateURL* turl) {
     turl_service_->Add(turl);
     turl_service_->SetDefaultSearchProvider(turl);
   }
 
   string16 GetBubbleMessage(const string16& short_name = string16()) {
     return short_name.empty() ?
         l10n_util::GetStringUTF16(IDS_SEARCH_ENGINE_CHANGE_MESSAGE) :
         l10n_util::GetStringFUTF16(IDS_SEARCH_ENGINE_CHANGE_NO_BACKUP_MESSAGE,
                                    short_name);
@@ skipping 47 matching lines @@
   // Most common case: current default search provider exists, backup is valid,
   // they are different.
   TemplateURL* backup_url =
       MakeTemplateURL(example_info, ASCIIToUTF16("a"), http_example_info);
   int backup_histogram_id = protector::GetSearchProviderHistogramID(backup_url);
   TemplateURL* current_url =
       MakeTemplateURL(example_com, ASCIIToUTF16("b"), http_example_com);
   int current_histogram_id =
       protector::GetSearchProviderHistogramID(current_url);
 
-  AddCopy(backup_url);
+  turl_service_->Add(new TemplateURL(backup_url->data()));
   AddAndSetDefault(current_url);
 
   scoped_ptr<BaseSettingChange> change(
       CreateDefaultSearchProviderChange(current_url, backup_url));
   ASSERT_TRUE(change.get());
   ASSERT_TRUE(change->Init(browser()->profile()));
 
   // Verify that backup is active.
   EXPECT_EQ(FindTemplateURL(http_example_info),
             turl_service_->GetDefaultSearchProvider());
@@ skipping 32 matching lines @@
       MakeTemplateURL(example_info, ASCIIToUTF16("a"), http_example_info);
   TemplateURL* backup_url_long =
       MakeTemplateURL(example_info_long, ASCIIToUTF16("a"), http_example_info);
   TemplateURL* current_url =
       MakeTemplateURL(example_com, ASCIIToUTF16("b"), http_example_com);
   TemplateURL* current_url_long =
       MakeTemplateURL(example_com_long, ASCIIToUTF16("b"), http_example_com);
 
   {
     // Backup name too long.
-    AddCopy(backup_url_long);
+    turl_service_->Add(new TemplateURL(backup_url_long->data()));
     AddAndSetDefault(current_url);
 
     scoped_ptr<BaseSettingChange> change(
         CreateDefaultSearchProviderChange(current_url, backup_url_long));
     ASSERT_TRUE(change.get());
     ASSERT_TRUE(change->Init(browser()->profile()));
 
     // Verify text messages.
     EXPECT_EQ(GetBubbleMessage(), change->GetBubbleMessage());
     EXPECT_EQ(GetChangeSearchButtonText(example_com),
               change->GetApplyButtonText());
     EXPECT_EQ(GetKeepSearchButtonText(), change->GetDiscardButtonText());
   }
 
   {
     // Current name too long.
-    AddCopy(backup_url);
+    turl_service_->Add(new TemplateURL(backup_url->data()));
     AddAndSetDefault(current_url_long);
 
     scoped_ptr<BaseSettingChange> change(
         CreateDefaultSearchProviderChange(current_url_long, backup_url));
     ASSERT_TRUE(change.get());
     ASSERT_TRUE(change->Init(browser()->profile()));
 
     // Verify text messages.
     EXPECT_EQ(GetBubbleMessage(), change->GetBubbleMessage());
     EXPECT_EQ(GetChangeSearchButtonText(), change->GetApplyButtonText());
@@ skipping 111 matching lines @@
             turl_service_->GetDefaultSearchProvider());
 }
 
 IN_PROC_BROWSER_TEST_F(DefaultSearchProviderChangeTest,
                        BackupValidCurrentRemoved) {
   // Backup is valid, no current search provider.
   TemplateURL* backup_url =
       MakeTemplateURL(example_info, ASCIIToUTF16("a"), http_example_info);
   int backup_histogram_id = protector::GetSearchProviderHistogramID(backup_url);
 
-  AddCopy(backup_url);
+  turl_service_->Add(new TemplateURL(backup_url->data()));
   turl_service_->SetDefaultSearchProvider(NULL);
 
   scoped_ptr<BaseSettingChange> change(
       CreateDefaultSearchProviderChange(NULL, backup_url));
   ASSERT_TRUE(change.get());
   ASSERT_TRUE(change->Init(browser()->profile()));
 
   // Verify that backup is active.
   EXPECT_EQ(FindTemplateURL(http_example_info),
             turl_service_->GetDefaultSearchProvider());
@@ skipping 105 matching lines @@
                        DefaultSearchProviderChangedByUser) {
   // Default search provider is changed by user while the error is active.
   // Setup is the same as in BackupValid test case.
   TemplateURL* backup_url =
       MakeTemplateURL(example_info, ASCIIToUTF16("a"), http_example_info);
   TemplateURL* current_url =
       MakeTemplateURL(example_com, ASCIIToUTF16("b"), http_example_com);
   TemplateURL* new_url =
       MakeTemplateURL(example_net, ASCIIToUTF16("c"), http_example_net);
 
-  AddCopy(backup_url);
+  turl_service_->Add(new TemplateURL(backup_url->data()));
   AddAndSetDefault(current_url);
 
   scoped_ptr<BaseSettingChange> change(
       CreateDefaultSearchProviderChange(current_url, backup_url));
   ASSERT_TRUE(change.get());
   ASSERT_TRUE(change->Init(browser()->profile()));
 
   // Verify that backup is active.
   EXPECT_EQ(FindTemplateURL(http_example_info),
             turl_service_->GetDefaultSearchProvider());
 
   // Verify that changing search provider externally dismissed the change.
   EXPECT_CALL(*mock_protector_service_, DismissChange(change.get()));
   AddAndSetDefault(new_url);
 }
 
 IN_PROC_BROWSER_TEST_F(DefaultSearchProviderChangeTest,
                        CurrentSearchProviderRemovedByUser) {
   // Current search provider is removed by user while the error is active.
   // Setup is the same as in BackupValid test case.
   TemplateURL* backup_url =
       MakeTemplateURL(example_info, ASCIIToUTF16("a"), http_example_info);
   TemplateURL* current_url =
       MakeTemplateURL(example_com, ASCIIToUTF16("b"), http_example_com);
 
-  AddCopy(backup_url);
+  turl_service_->Add(new TemplateURL(backup_url->data()));
   AddAndSetDefault(current_url);
 
   scoped_ptr<BaseSettingChange> change(
       CreateDefaultSearchProviderChange(current_url, backup_url));
   ASSERT_TRUE(change.get());
   ASSERT_TRUE(change->Init(browser()->profile()));
 
   // Verify that backup is active.
   EXPECT_EQ(FindTemplateURL(http_example_info),
             turl_service_->GetDefaultSearchProvider());
@@ skipping 12 matching lines @@
   EXPECT_EQ(FindTemplateURL(http_example_info),
             turl_service_->GetDefaultSearchProvider());
 
   // Discard does nothing - backup was already active.
   change->Discard(browser());
   EXPECT_EQ(FindTemplateURL(http_example_info),
             turl_service_->GetDefaultSearchProvider());
 }
 
 }  // namespace protector