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

chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc

Index: chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc
===================================================================
--- chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc	(revision 130285)
+++ chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc	(working copy)
@@ -116,10 +116,8 @@
                        it->is_history_what_you_typed_match);
     output->SetString(item_prefix + ".type",
                       AutocompleteMatch::TypeToString(it->type));
-    if ((it->template_url != NULL) && (it->template_url->url() != NULL)) {
-      output->SetString(item_prefix + ".template_url",
-                        it->template_url->url()->url());
-    }
+    if (it->template_url != NULL)
+      output->SetString(item_prefix + ".template_url", it->template_url->url());
     output->SetBoolean(item_prefix + ".starred", it->starred);
     output->SetBoolean(item_prefix + ".from_previous", it->from_previous);
   }