Add a Profile* member to TemplateURL. This makes some invocations of ReplaceSearchTerms() a bit le…

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/base_setting_change.h"
 #include "chrome/browser/protector/histograms.h"
@@ skipping 32 matching lines @@
 const std::string http_example_com_no_search_terms =
     "http://example.com/";
 const std::string example_com_domain = "example.com";
 const string16 example_net = ASCIIToUTF16("Example.net");
 const std::string http_example_net = "http://example.net/?q={searchTerms}";
 const std::string example_domain = "example.net";
 
 const BaseSettingChange::DisplayName kNoDisplayName(
     BaseSettingChange::kDefaultNamePriority, string16());
 
-// 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);
-}
-
 }  // namespace
 
 class DefaultSearchProviderChangeTest : public InProcessBrowserTest {
  public:
   virtual void SetUpOnMainThread() OVERRIDE {
-    mock_protector_service_ =
-        MockProtectorService::BuildForProfile(browser()->profile());
+    Profile* profile = browser()->profile();
+    mock_protector_service_ = MockProtectorService::BuildForProfile(profile);
 
     // Ensure that TemplateURLService is loaded.
-    turl_service_ =
-        TemplateURLServiceFactory::GetForProfile(browser()->profile());
+    turl_service_ = TemplateURLServiceFactory::GetForProfile(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& url) {
+    TemplateURLData data;
+    data.short_name = short_name;
+    if (keyword.empty())
+      data.SetAutogenerateKeyword(true);
+    else
+      data.SetKeyword(keyword);
+    data.SetURL(url);
+    return new TemplateURL(browser()->profile(), data);
+  }
+
   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;
   }
@@ skipping 58 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);
 
-  turl_service_->Add(new TemplateURL(backup_url->data()));
+  Profile* profile = browser()->profile();
+  turl_service_->Add(new TemplateURL(profile, 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()));
+  ASSERT_TRUE(change->Init(profile));
 
   // Verify that backup is active.
   EXPECT_EQ(FindTemplateURL(http_example_info),
             turl_service_->GetDefaultSearchProvider());
 
   // Verify histograms.
   ExpectHistogramCount(kProtectorHistogramSearchProviderHijacked,
                        current_histogram_id, 1);
   ExpectHistogramCount(kProtectorHistogramSearchProviderRestored,
                        backup_histogram_id, 1);
@@ skipping 26 matching lines @@
   // Verify that search provider names that are too long are not displayed.
   TemplateURL* backup_url =
       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);
 
+  Profile* profile = browser()->profile();
   {
     // Backup name too long.
-    turl_service_->Add(new TemplateURL(backup_url_long->data()));
+    turl_service_->Add(new TemplateURL(profile, 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()));
+    ASSERT_TRUE(change->Init(profile));
 
     // Verify text messages.
     EXPECT_EQ(GetBubbleMessage(), change->GetBubbleMessage());
     EXPECT_EQ(GetChangeSearchButtonText(example_com),
               change->GetApplyButtonText());
     EXPECT_EQ(GetKeepSearchButtonText(), change->GetDiscardButtonText());
     EXPECT_EQ(example_com_domain, change->GetNewSettingURL().host());
     EXPECT_EQ(example_com, change->GetApplyDisplayName().second);
   }
 
   {
     // Current name too long.
-    turl_service_->Add(new TemplateURL(backup_url->data()));
+    turl_service_->Add(new TemplateURL(profile, 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()));
+    ASSERT_TRUE(change->Init(profile));
 
     // Verify text messages.
     EXPECT_EQ(GetBubbleMessage(), change->GetBubbleMessage());
     EXPECT_EQ(GetChangeSearchButtonText(), change->GetApplyButtonText());
     EXPECT_EQ(GetKeepSearchButtonText(example_info),
               change->GetDiscardButtonText());
     EXPECT_EQ(example_com_domain, change->GetNewSettingURL().host());
     EXPECT_EQ(kNoDisplayName, change->GetApplyDisplayName());
   }
 }
@@ skipping 166 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);
 
-  turl_service_->Add(new TemplateURL(backup_url->data()));
+  Profile* profile = browser()->profile();
+  turl_service_->Add(new TemplateURL(profile, 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()));
+  ASSERT_TRUE(change->Init(profile));
 
   // Verify that backup is active.
   EXPECT_EQ(FindTemplateURL(http_example_info),
             turl_service_->GetDefaultSearchProvider());
 
   // Verify histograms.
   ExpectHistogramCount(kProtectorHistogramSearchProviderHijacked,
                        protector::GetSearchProviderHistogramID(NULL), 1);
   ExpectHistogramCount(kProtectorHistogramSearchProviderRestored,
                        backup_histogram_id, 1);
@@ skipping 23 matching lines @@
   // Backup is valid, current search provider has no search terms.
   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_no_search_terms);
   int current_histogram_id =
       protector::GetSearchProviderHistogramID(current_url);
 
-  turl_service_->Add(new TemplateURL(backup_url->data()));
+  Profile* profile = browser()->profile();
+  turl_service_->Add(new TemplateURL(profile, backup_url->data()));
   // TODO(ivankr): this may become unsupported soon.
   AddAndSetDefault(current_url);
 
   scoped_ptr<BaseSettingChange> change(
       CreateDefaultSearchProviderChange(current_url, backup_url));
   ASSERT_TRUE(change.get());
-  ASSERT_TRUE(change->Init(browser()->profile()));
+  ASSERT_TRUE(change->Init(profile));
 
   // Verify that backup is active.
   EXPECT_EQ(FindTemplateURL(http_example_info),
             turl_service_->GetDefaultSearchProvider());
 
   // Verify histograms.
   ExpectHistogramCount(kProtectorHistogramSearchProviderHijacked,
                        current_histogram_id, 1);
   ExpectHistogramCount(kProtectorHistogramSearchProviderRestored,
                        backup_histogram_id, 1);
@@ 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);
 
-  turl_service_->Add(new TemplateURL(backup_url->data()));
+  Profile* profile = browser()->profile();
+  turl_service_->Add(new TemplateURL(profile, 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()));
+  ASSERT_TRUE(change->Init(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);
 
-  turl_service_->Add(new TemplateURL(backup_url->data()));
+  Profile* profile = browser()->profile();
+  turl_service_->Add(new TemplateURL(profile, 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()));
+  ASSERT_TRUE(change->Init(profile));
 
   // Verify that backup is active.
   EXPECT_EQ(FindTemplateURL(http_example_info),
             turl_service_->GetDefaultSearchProvider());
 
   turl_service_->Remove(current_url);
 
   // Verify that text messages altered after removing |current_url|.
   EXPECT_EQ(GetBubbleMessage(), change->GetBubbleMessage());
   EXPECT_EQ(GetOpenSettingsButtonText(), change->GetApplyButtonText());
   EXPECT_EQ(GetKeepSearchButtonText(example_info),
             change->GetDiscardButtonText());
   EXPECT_EQ(GURL(), change->GetNewSettingURL());
   EXPECT_EQ(kNoDisplayName, change->GetApplyDisplayName());
 
   // Verify that search engine settings are opened by Apply.
   ExpectSettingsOpened(chrome::kSearchEnginesSubPage);
   change->Apply(browser());
   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