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

chrome/browser/protector/default_search_provider_change_browsertest.cc

Index: chrome/browser/protector/default_search_provider_change_browsertest.cc
===================================================================
--- chrome/browser/protector/default_search_provider_change_browsertest.cc	(revision 130565)
+++ chrome/browser/protector/default_search_provider_change_browsertest.cc	(working copy)
@@ -79,7 +79,7 @@
         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;
@@ -257,7 +257,7 @@
   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));
@@ -265,7 +265,7 @@
   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.
@@ -286,7 +286,7 @@
   // 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|.
@@ -310,7 +310,7 @@
   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);
@@ -321,7 +321,7 @@
   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.
@@ -344,7 +344,7 @@
   // 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|.
@@ -410,7 +410,7 @@
   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.
@@ -430,7 +430,7 @@
   // 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());
 }
 
@@ -444,7 +444,7 @@
 
   // 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));