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

chrome/browser/search_engines/template_url_parser.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/search_engines/template_url_parser.h"
 
 #include <algorithm>
 #include <map>
 #include <vector>
 
@@ skipping 76 matching lines @@
                         std::string* query) {
   if (!query->empty())
     query->append("&");
   if (!key.empty()) {
     query->append(key);
     query->append("=");
   }
   query->append(value);
 }
 
-// Returns true if |url| is empty or is a valid URL with a scheme of HTTP[S].
-bool IsHTTPRef(const std::string& url) {
-  if (url.empty())
+// Returns true if the ref is null, or the url wrapped by ref is
+// valid with a spec of http/https.
+bool IsHTTPRef(const TemplateURLRef* ref) {
+  if (ref == NULL)
     return true;
-  GURL gurl(url);
-  return (gurl.is_valid() && (gurl.SchemeIs(chrome::kHttpScheme) ||
-                              gurl.SchemeIs(chrome::kHttpsScheme)));
+  GURL url(ref->url());
+  return (url.is_valid() && (url.SchemeIs(chrome::kHttpScheme) ||
+                             url.SchemeIs(chrome::kHttpsScheme)));
 }
 
 }  // namespace
 
 
 // TemplateURLParsingContext --------------------------------------------------
 
 // To minimize memory overhead while parsing, a SAX style parser is used.
 // TemplateURLParsingContext is used to maintain the state we're in the document
 // while parsing.
@@ skipping 177 matching lines @@
 }
 
 TemplateURL* TemplateURLParsingContext::GetTemplateURL(Profile* profile) {
   // Basic legality checks.
   if (url_->short_name_.empty() || !IsHTTPRef(url_->url()) ||
       !IsHTTPRef(url_->suggestions_url()))
     return NULL;
 
   // If the image was a data URL, use the favicon from the search URL instead.
   // (see TODO inEndElementImpl()).
-  GURL url(url_->url());
+  GURL url(url_->url()->url());
   if (derive_image_from_url_ && url_->favicon_url().is_empty())
     url_->set_favicon_url(TemplateURL::GenerateFaviconURL(url));
 
   // TODO(jcampan): http://b/issue?id=1196285 we do not support search engines
   //                that use POST yet.
   if (method_ == TemplateURLParsingContext::POST)
     return NULL;
   if (suggestion_method_ == TemplateURLParsingContext::POST)
     url_->SetSuggestionsURL(std::string());
 
@@ skipping 94 matching lines @@
 
   if (!key.empty() &&
       (!parameter_filter_ || parameter_filter_->KeepParameter(key, value)))
     extra_params_.push_back(Param(key, value));
 }
 
 void TemplateURLParsingContext::ProcessURLParams() {
   if (!parameter_filter_ && extra_params_.empty())
     return;
 
-  GURL url(is_suggest_url_ ? url_->suggestions_url() : url_->url());
-  if (url.is_empty())
+  const TemplateURLRef* t_url_ref =
+      is_suggest_url_ ? url_->suggestions_url() : url_->url();
+  if (!t_url_ref)
     return;
-
+  GURL url(t_url_ref->url());
   // If there is a parameter filter, parse the existing URL and remove any
   // unwanted parameter.
   std::string new_query;
   bool modified = false;
   if (parameter_filter_) {
     url_parse::Component query = url.parsed_for_possibly_invalid_spec().query;
     url_parse::Component key, value;
     const char* url_spec = url.spec().c_str();
     while (url_parse::ExtractQueryKeyValue(url_spec, &query, &key, &value)) {
       std::string key_str(url_spec, key.begin, key.len);
@@ skipping 54 matching lines @@
   xmlSAXHandler sax_handler;
   memset(&sax_handler, 0, sizeof(sax_handler));
   sax_handler.startElement = &TemplateURLParsingContext::StartElementImpl;
   sax_handler.endElement = &TemplateURLParsingContext::EndElementImpl;
   sax_handler.characters = &TemplateURLParsingContext::CharactersImpl;
   xmlSAXUserParseMemory(&sax_handler, &context, data, static_cast<int>(length));
   xmlSubstituteEntitiesDefault(last_sub_entities_value);
 
   return context.GetTemplateURL(profile);
 }