Remove ScopedVector from importer.

components/search_engines/template_url_parser.cc

 // Copyright 2014 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 "components/search_engines/template_url_parser.h"
 
 #include <string.h>
 
 #include <algorithm>
 #include <map>
 #include <memory>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/search_engines/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"
@@ skipping 107 matching lines @@
 
   explicit TemplateURLParsingContext(
       TemplateURLParser::ParameterFilter* parameter_filter);
 
   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(const SearchTermsData& search_terms_data,
-                              bool show_in_default_list);
+  // Returns a TemplateURL representing the result of parsing.  This will be an
+  // empty unique_ptr if parsing failed or if the results were invalid for some

[Peter Kasting, 2016/09/01 22:55:41]

Nit: "This will be null"?

[Avi (use Gerrit), 2016/09/01 23:28:33]

Done.

+  // reason (e.g. the resulting URL was not HTTP[S], a name wasn't supplied, a
+  // resulting TemplateURLRef was invalid, etc.).
+  std::unique_ptr<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 133 matching lines @@
 
 // static
 void TemplateURLParsingContext::CharactersImpl(void* ctx,
                                                const xmlChar* ch,
                                                int len) {
   reinterpret_cast<TemplateURLParsingContext*>(ctx)->string_ +=
       base::UTF8ToUTF16(
           base::StringPiece(reinterpret_cast<const char*>(ch), len));
 }
 
-TemplateURL* TemplateURLParsingContext::GetTemplateURL(
+std::unique_ptr<TemplateURL> TemplateURLParsingContext::GetTemplateURL(
     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;
+    return std::unique_ptr<TemplateURL>();

[Peter Kasting, 2016/09/01 22:55:41]

Nit: return nullptr?

   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);
 
   // Generate a keyword for this search engine if a custom one was not present
   // in the imported data.
   if (!has_custom_keyword_)
     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.
-  std::unique_ptr<TemplateURL> template_url(new TemplateURL(data_));
+  std::unique_ptr<TemplateURL> template_url(

[Peter Kasting, 2016/09/01 22:55:41]

Nit: () -> =

[Avi (use Gerrit), 2016/09/01 23:28:33]

Done.

+      base::MakeUnique<TemplateURL>(data_));
   if (template_url->url().empty() ||
       !template_url->url_ref().IsValid(search_terms_data) ||
       (!template_url->suggestions_url().empty() &&
        !template_url->suggestions_url_ref().IsValid(search_terms_data))) {
-    return NULL;
+    return std::unique_ptr<TemplateURL>();

[Peter Kasting, 2016/09/01 22:55:41]

Nit: return nullptr?

[Avi (use Gerrit), 2016/09/01 23:28:33]

Done.

   }
 
-  return template_url.release();
+  return template_url;
 }
 
 // static
 void TemplateURLParsingContext::InitMapping() {
   kElementNameToElementTypeMap = new std::map<std::string, ElementType>;
   (*kElementNameToElementTypeMap)[kURLElement] = URL;
   (*kElementNameToElementTypeMap)[kParamElement] = PARAM;
   (*kElementNameToElementTypeMap)[kShortNameElement] = SHORT_NAME;
   (*kElementNameToElementTypeMap)[kImageElement] = IMAGE;
   (*kElementNameToElementTypeMap)[kOpenSearchDescriptionElement] =
@@ skipping 137 matching lines @@
     return elements_[1];
   // 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(
+std::unique_ptr<TemplateURL> TemplateURLParser::Parse(
     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(search_terms_data, show_in_default_list);
+  return error ? nullptr : context.GetTemplateURL(search_terms_data,
+                                                  show_in_default_list);
 }