Move the URL string from TemplateURLRef onto the owning TemplateURL. This will make it easier to m…

chrome/browser/automation/testing_automation_provider.cc

Index: chrome/browser/automation/testing_automation_provider.cc
===================================================================
--- chrome/browser/automation/testing_automation_provider.cc	(revision 130285)
+++ chrome/browser/automation/testing_automation_provider.cc	(working copy)
@@ -3366,14 +3366,14 @@
     search_engine->SetBoolean("in_default_list", (*it)->ShowInDefaultList());
     search_engine->SetBoolean("is_default",
         (*it) == url_model->GetDefaultSearchProvider());
-    search_engine->SetBoolean("is_valid", (*it)->url()->IsValid());
+    search_engine->SetBoolean("is_valid", (*it)->url_ref().IsValid());
     search_engine->SetBoolean("supports_replacement",
-                              (*it)->url()->SupportsReplacement());
-    search_engine->SetString("url", (*it)->url()->url());
-    search_engine->SetString("host", (*it)->url()->GetHost());
-    search_engine->SetString("path", (*it)->url()->GetPath());
+                              (*it)->url_ref().SupportsReplacement());
+    search_engine->SetString("url", (*it)->url());
+    search_engine->SetString("host", (*it)->url_ref().GetHost());
+    search_engine->SetString("path", (*it)->url_ref().GetPath());
     search_engine->SetString("display_url",
-                             UTF16ToUTF8((*it)->url()->DisplayURL()));
+                             UTF16ToUTF8((*it)->url_ref().DisplayURL()));
     search_engines->Append(search_engine);
   }
   return_value->Set("search_engines", search_engines);