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

chrome/browser/automation/testing_automation_provider.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 "chrome/browser/automation/testing_automation_provider.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 3353 matching lines @@
   TemplateURLService::TemplateURLVector template_urls =
       url_model->GetTemplateURLs();
   for (TemplateURLService::TemplateURLVector::const_iterator it =
        template_urls.begin(); it != template_urls.end(); ++it) {
     DictionaryValue* search_engine = new DictionaryValue;
     search_engine->SetString("short_name", UTF16ToUTF8((*it)->short_name()));
     search_engine->SetString("keyword", UTF16ToUTF8((*it)->keyword()));
     search_engine->SetBoolean("in_default_list", (*it)->ShowInDefaultList());
     search_engine->SetBoolean("is_default",
         (*it) == url_model->GetDefaultSearchProvider());
-    search_engine->SetBoolean("is_valid", (*it)->url_ref().IsValid());
+    search_engine->SetBoolean("is_valid", (*it)->url()->IsValid());
     search_engine->SetBoolean("supports_replacement",
-                              (*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());
+                              (*it)->url()->SupportsReplacement());
+    search_engine->SetString("url", (*it)->url()->url());
+    search_engine->SetString("host", (*it)->url()->GetHost());
+    search_engine->SetString("path", (*it)->url()->GetPath());
     search_engine->SetString("display_url",
-                             UTF16ToUTF8((*it)->url_ref().DisplayURL()));
+                             UTF16ToUTF8((*it)->url()->DisplayURL()));
     search_engines->Append(search_engine);
   }
   return_value->Set("search_engines", search_engines);
   AutomationJSONReply(this, reply_message).SendSuccess(return_value.get());
 }
 
 // Refer to pyauto.py for sample JSON input.
 void TestingAutomationProvider::AddOrEditSearchEngine(
     Browser* browser,
     DictionaryValue* args,
@@ skipping 3722 matching lines @@
 
   Send(reply_message_);
   redirect_query_ = 0;
   reply_message_ = NULL;
 }
 
 void TestingAutomationProvider::OnRemoveProvider() {
   if (g_browser_process)
     g_browser_process->GetAutomationProviderList()->RemoveProvider(this);
 }