Revert 130431 - Move the URL string from TemplateURLRef onto the owning TemplateURL. This will mak…

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 61 matching lines @@
       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)
+      if ((*it)->url()->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);
   }
@@ skipping 157 matching lines @@
   int prepopulated_histogram_id =
       protector::GetSearchProviderHistogramID(prepopulated_url_.get());
   TemplateURL* current_url =
       MakeTemplateURL(example_com, ASCIIToUTF16("b"), http_example_com);
   int current_histogram_id =
       protector::GetSearchProviderHistogramID(current_url);
 
   AddAndSetDefault(current_url);
 
   // Prepopulated default search must exist.
-  ASSERT_TRUE(FindTemplateURL(prepopulated_url_->url()));
+  ASSERT_TRUE(FindTemplateURL(prepopulated_url_->url()->url()));
 
   scoped_ptr<BaseSettingChange> change(
       CreateDefaultSearchProviderChange(current_url, NULL));
   ASSERT_TRUE(change.get());
   ASSERT_TRUE(change->Init(browser()->profile()));
 
   // Verify that the prepopulated default search is active.
-  EXPECT_EQ(FindTemplateURL(prepopulated_url_->url()),
+  EXPECT_EQ(FindTemplateURL(prepopulated_url_->url()->url()),
             turl_service_->GetDefaultSearchProvider());
 
   // Verify histograms.
   ExpectHistogramCount(kProtectorHistogramSearchProviderCorrupt,
                        current_histogram_id, 1);
   ExpectHistogramCount(kProtectorHistogramSearchProviderRestored,
                        prepopulated_histogram_id, 1);
   ExpectHistogramCount(kProtectorHistogramSearchProviderFallback,
                        prepopulated_histogram_id, 1);
 
   // Verify text messages.
   EXPECT_EQ(GetBubbleMessage(prepopulated_url_->short_name()),
             change->GetBubbleMessage());
   EXPECT_EQ(GetChangeSearchButtonText(example_com),
             change->GetApplyButtonText());
   EXPECT_EQ(GetOpenSettingsButtonText(), change->GetDiscardButtonText());
 
   // Verify that search engine settings are opened by Discard.
   ExpectSettingsOpened(chrome::kSearchEnginesSubPage);
   change->Discard(browser());
-  EXPECT_EQ(FindTemplateURL(prepopulated_url_->url()),
+  EXPECT_EQ(FindTemplateURL(prepopulated_url_->url()->url()),
             turl_service_->GetDefaultSearchProvider());
 
   // Verify that Apply switches back to |current_url|.
   change->Apply(browser());
   EXPECT_EQ(FindTemplateURL(http_example_com),
             turl_service_->GetDefaultSearchProvider());
 }
 
 IN_PROC_BROWSER_TEST_F(DefaultSearchProviderChangeTest,
                        BackupInvalidFallbackRemoved) {
   // Backup is invalid, current search provider exists, fallback to the
   // prepopulated default search, which was removed from keywords (will be
   // added).
   int prepopulated_histogram_id =
       protector::GetSearchProviderHistogramID(prepopulated_url_.get());
   TemplateURL* current_url =
       MakeTemplateURL(example_com, ASCIIToUTF16("b"), http_example_com);
   int current_histogram_id =
       protector::GetSearchProviderHistogramID(current_url);
 
   AddAndSetDefault(current_url);
 
   const TemplateURL* prepopulated_default =
-      FindTemplateURL(prepopulated_url_->url());
+      FindTemplateURL(prepopulated_url_->url()->url());
   // Prepopulated default search must exist, remove it.
   ASSERT_TRUE(prepopulated_default);
   turl_service_->Remove(prepopulated_default);
 
   scoped_ptr<BaseSettingChange> change(
       CreateDefaultSearchProviderChange(current_url, NULL));
   ASSERT_TRUE(change.get());
   ASSERT_TRUE(change->Init(browser()->profile()));
 
   // Verify that the prepopulated default search is active.
-  EXPECT_EQ(FindTemplateURL(prepopulated_url_->url()),
+  EXPECT_EQ(FindTemplateURL(prepopulated_url_->url()->url()),
             turl_service_->GetDefaultSearchProvider());
 
   // Verify histograms.
   ExpectHistogramCount(kProtectorHistogramSearchProviderCorrupt,
                        current_histogram_id, 1);
   ExpectHistogramCount(kProtectorHistogramSearchProviderRestored,
                        prepopulated_histogram_id, 1);
   ExpectHistogramCount(kProtectorHistogramSearchProviderFallback,
                        prepopulated_histogram_id, 1);
   ExpectHistogramCount(kProtectorHistogramSearchProviderMissing,
                        prepopulated_histogram_id, 1);
 
   // Verify text messages.
   EXPECT_EQ(GetBubbleMessage(prepopulated_url_->short_name()),
             change->GetBubbleMessage());
   EXPECT_EQ(GetChangeSearchButtonText(example_com),
             change->GetApplyButtonText());
   EXPECT_EQ(GetOpenSettingsButtonText(), change->GetDiscardButtonText());
 
   // Verify that search engine settings are opened by Discard.
   ExpectSettingsOpened(chrome::kSearchEnginesSubPage);
   change->Discard(browser());
-  EXPECT_EQ(FindTemplateURL(prepopulated_url_->url()),
+  EXPECT_EQ(FindTemplateURL(prepopulated_url_->url()->url()),
             turl_service_->GetDefaultSearchProvider());
 
   // Verify that Apply switches back to |current_url|.
   change->Apply(browser());
   EXPECT_EQ(FindTemplateURL(http_example_com),
             turl_service_->GetDefaultSearchProvider());
 }
 
 IN_PROC_BROWSER_TEST_F(DefaultSearchProviderChangeTest,
                        BackupValidCurrentRemoved) {
@@ skipping 45 matching lines @@
   int prepopulated_histogram_id =
       protector::GetSearchProviderHistogramID(prepopulated_url_.get());
   turl_service_->SetDefaultSearchProvider(NULL);
 
   scoped_ptr<BaseSettingChange> change(
       CreateDefaultSearchProviderChange(NULL, NULL));
   ASSERT_TRUE(change.get());
   ASSERT_TRUE(change->Init(browser()->profile()));
 
   // Verify that the prepopulated default search is active.
-  EXPECT_EQ(FindTemplateURL(prepopulated_url_->url()),
+  EXPECT_EQ(FindTemplateURL(prepopulated_url_->url()->url()),
             turl_service_->GetDefaultSearchProvider());
 
   // Verify histograms.
   ExpectHistogramCount(kProtectorHistogramSearchProviderCorrupt,
                        protector::GetSearchProviderHistogramID(NULL), 1);
   ExpectHistogramCount(kProtectorHistogramSearchProviderRestored,
                        prepopulated_histogram_id, 1);
   ExpectHistogramCount(kProtectorHistogramSearchProviderFallback,
                        prepopulated_histogram_id, 1);
 
   // Verify text messages.
   EXPECT_EQ(GetBubbleMessage(prepopulated_url_->short_name()),
             change->GetBubbleMessage());
   EXPECT_EQ(string16(), change->GetApplyButtonText());
   EXPECT_EQ(GetOpenSettingsButtonText(), change->GetDiscardButtonText());
 
   // Verify that search engine settings are opened by Discard.
   ExpectSettingsOpened(chrome::kSearchEnginesSubPage);
   change->Discard(browser());
-  EXPECT_EQ(FindTemplateURL(prepopulated_url_->url()),
+  EXPECT_EQ(FindTemplateURL(prepopulated_url_->url()->url()),
             turl_service_->GetDefaultSearchProvider());
 }
 
 IN_PROC_BROWSER_TEST_F(DefaultSearchProviderChangeTest,
                        BackupInvalidFallbackSameAsCurrent) {
   // Backup is invalid, fallback to the prepopulated default search which is
   // same as the current search provider.
   int prepopulated_histogram_id =
       protector::GetSearchProviderHistogramID(prepopulated_url_.get());
   const TemplateURL* current_url = turl_service_->GetDefaultSearchProvider();
 
   // Verify that current search provider is same as the prepopulated default.
   ASSERT_TRUE(current_url);
-  ASSERT_EQ(current_url, FindTemplateURL(prepopulated_url_->url()));
+  ASSERT_EQ(current_url, FindTemplateURL(prepopulated_url_->url()->url()));
 
   scoped_ptr<BaseSettingChange> change(
       CreateDefaultSearchProviderChange(current_url, NULL));
   ASSERT_TRUE(change.get());
   ASSERT_TRUE(change->Init(browser()->profile()));
 
   // Verify that the default search has not changed.
   EXPECT_EQ(current_url, turl_service_->GetDefaultSearchProvider());
 
   // Verify histograms.
@@ skipping 80 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