No chrome dependencies in TemplateURLFetcher and TemplateURLParser

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>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/search_engines/ui_thread_search_terms_data.h"
 #include "components/search_engines/template_url.h"
 #include "libxml/parser.h"
 #include "libxml/xmlwriter.h"
 #include "ui/gfx/favicon_size.h"
 #include "url/gurl.h"
 #include "url/url_constants.h"
 
 namespace {
 
 // NOTE: libxml uses the UTF-8 encoding. As 0-127 of UTF-8 corresponds
@@ skipping 105 matching lines @@
   static void StartElementImpl(void* ctx,
                                const xmlChar* name,
                                const xmlChar** atts);
   static void EndElementImpl(void* ctx, const xmlChar* name);
   static void CharactersImpl(void* ctx, const xmlChar* ch, int len);
 
   // Returns a heap-allocated TemplateURL representing the result of parsing.
   // This will be NULL if parsing failed or if the results were invalid for some
   // reason (e.g. the resulting URL was not HTTP[S], a name wasn't supplied,
   // a resulting TemplateURLRef was invalid, etc.).
-  TemplateURL* GetTemplateURL(Profile* profile, bool show_in_default_list);
+  TemplateURL* GetTemplateURL(const SearchTermsData& search_terms_data,
+                              bool show_in_default_list);
 
  private:
   // Key is UTF8 encoded.
   typedef std::map<std::string, ElementType> ElementNameToElementTypeMap;
 
   static void InitMapping();
 
   void ParseURL(const xmlChar** atts);
   void ParseImage(const xmlChar** atts);
   void ParseParam(const xmlChar** atts);
@@ skipping 123 matching lines @@
 
 // static
 void TemplateURLParsingContext::CharactersImpl(void* ctx,
                                                const xmlChar* ch,
                                                int len) {
   reinterpret_cast<TemplateURLParsingContext*>(ctx)->string_ +=
       base::UTF8ToUTF16(std::string(reinterpret_cast<const char*>(ch), len));
 }
 
 TemplateURL* TemplateURLParsingContext::GetTemplateURL(
-    Profile* profile,
+    const SearchTermsData& search_terms_data,
     bool show_in_default_list) {
   // TODO(jcampan): Support engines that use POST; see http://crbug.com/18107
   if (method_ == TemplateURLParsingContext::POST || data_.short_name.empty() ||
       !IsHTTPRef(data_.url()) || !IsHTTPRef(data_.suggestions_url))
     return NULL;
   if (suggestion_method_ == TemplateURLParsingContext::POST)
     data_.suggestions_url.clear();
 
   // If the image was a data URL, use the favicon from the search URL instead.
   // (see the TODO in EndElementImpl()).
   GURL search_url(data_.url());
   if (derive_image_from_url_ && data_.favicon_url.is_empty())
     data_.favicon_url = TemplateURL::GenerateFaviconURL(search_url);
 
   data_.SetKeyword(TemplateURL::GenerateKeyword(search_url));
   data_.show_in_default_list = show_in_default_list;
 
   // Bail if the search URL is empty or if either TemplateURLRef is invalid.
   scoped_ptr<TemplateURL> template_url(new TemplateURL(data_));
-  scoped_ptr<SearchTermsData> search_terms_data(profile ?
-      new UIThreadSearchTermsData(profile) : new SearchTermsData());
   if (template_url->url().empty() ||
-      !template_url->url_ref().IsValid(*search_terms_data) ||
+      !template_url->url_ref().IsValid(search_terms_data) ||
       (!template_url->suggestions_url().empty() &&
-       !template_url->suggestions_url_ref().IsValid(*search_terms_data))) {
+       !template_url->suggestions_url_ref().IsValid(search_terms_data))) {
     return NULL;
   }
 
   return template_url.release();
 }
 
 // static
 void TemplateURLParsingContext::InitMapping() {
   kElementNameToElementTypeMap = new std::map<std::string, ElementType>;
   (*kElementNameToElementTypeMap)[kURLElement] = URL;
@@ skipping 141 matching lines @@
   // We only expect PARAM nodes under the URL node.
   return (elements_.size() == 3 && elements_[0] == OPEN_SEARCH_DESCRIPTION &&
       elements_[1] == URL && elements_[2] == PARAM) ? PARAM : UNKNOWN;
 }
 
 
 // TemplateURLParser ----------------------------------------------------------
 
 // static
 TemplateURL* TemplateURLParser::Parse(
-    Profile* profile,
+    const SearchTermsData& search_terms_data,
     bool show_in_default_list,
     const char* data,
     size_t length,
     TemplateURLParser::ParameterFilter* param_filter) {
   // xmlSubstituteEntitiesDefault(1) makes it so that &amp; isn't mapped to
   // &#38; . Unfortunately xmlSubstituteEntitiesDefault affects global state.
   // If this becomes problematic we'll need to provide our own entity
   // type for &amp;, or strip out &#38; by hand after parsing.
   int last_sub_entities_value = xmlSubstituteEntitiesDefault(1);
   TemplateURLParsingContext context(param_filter);
   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;
   int error = xmlSAXUserParseMemory(&sax_handler, &context, data,
                                     static_cast<int>(length));
   xmlSubstituteEntitiesDefault(last_sub_entities_value);
 
-  return error ? NULL : context.GetTemplateURL(profile, show_in_default_list);
+  return error ?
+      NULL : context.GetTemplateURL(search_terms_data, show_in_default_list);
 }