Remove stl_util's deletion function use from components/query_parser/.

components/history/core/browser/url_database.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/history/core/browser/url_database.h"
 
 #include <limits>
 #include <string>
 #include <vector>
 
 #include "base/i18n/case_conversion.h"
 #include "base/macros.h"
-#include "base/memory/scoped_vector.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/history/core/browser/keyword_search_term.h"
 #include "components/url_formatter/url_formatter.h"
 #include "sql/statement.h"
 #include "url/gurl.h"
 
 namespace history {
 
 const char URLDatabase::kURLRowFields[] = HISTORY_URL_ROW_FIELDS;
 const int URLDatabase::kNumURLRowFields = 9;
@@ skipping 332 matching lines @@
 bool URLDatabase::GetTextMatches(const base::string16& query,
                                  URLRows* results) {
   return GetTextMatchesWithAlgorithm(
       query, query_parser::MatchingAlgorithm::DEFAULT, results);
 }
 
 bool URLDatabase::GetTextMatchesWithAlgorithm(
     const base::string16& query,
     query_parser::MatchingAlgorithm algorithm,
     URLRows* results) {
-  ScopedVector<query_parser::QueryNode> query_nodes;
-  query_parser_.ParseQueryNodes(query, algorithm, &query_nodes.get());
+  query_parser::QueryNodeVector query_nodes;
+  query_parser_.ParseQueryNodes(query, algorithm, &query_nodes);
 
   results->clear();
   sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE,
       "SELECT" HISTORY_URL_ROW_FIELDS "FROM urls WHERE hidden = 0"));
 
   while (statement.Step()) {
     query_parser::QueryWordVector query_words;
     base::string16 url = base::i18n::ToLower(statement.ColumnString16(1));
     query_parser_.ExtractQueryWords(url, &query_words);
     GURL gurl(url);
     if (gurl.is_valid()) {
       // Decode punycode to match IDN.
       base::string16 ascii = base::ASCIIToUTF16(gurl.host());
       base::string16 utf = url_formatter::IDNToUnicode(gurl.host());
       if (ascii != utf)
         query_parser_.ExtractQueryWords(utf, &query_words);
     }
     base::string16 title = base::i18n::ToLower(statement.ColumnString16(2));
     query_parser_.ExtractQueryWords(title, &query_words);
 
-    if (query_parser_.DoesQueryMatch(query_words, query_nodes.get())) {
+    if (query_parser_.DoesQueryMatch(query_words, query_nodes)) {
       URLResult info;
       FillURLRow(statement, &info);
       if (info.url().is_valid())
         results->push_back(info);
     }
   }
   return !results->empty();
 }
 
 bool URLDatabase::InitKeywordSearchTermsTable() {
@@ skipping 232 matching lines @@
 bool RowQualifiesAsSignificant(const URLRow& row,
                                const base::Time& threshold) {
   const base::Time& real_threshold =
       threshold.is_null() ? AutocompleteAgeThreshold() : threshold;
   return (row.typed_count() >= kLowQualityMatchTypedLimit) ||
          (row.visit_count() >= kLowQualityMatchVisitLimit) ||
          (row.last_visit() >= real_threshold);
 }
 
 }  // namespace history