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

components/query_parser/query_parser_unittest.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 <stddef.h>
 
 #include "base/macros.h"
-#include "base/memory/scoped_vector.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/query_parser/query_parser.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace query_parser {
 
 class QueryParserTest : public testing::Test {
  public:
   struct TestData {
     const char* input;
@@ skipping 97 matching lines @@
     { "foo blah",      "blah",             false, 0, 0, 0, 0 },
     { "foo blah",      "blahx foobar",     true,  0, 4, 6, 9 },
     { "\"foo blah\"",  "foo blah",         true,  0, 8, 0, 0 },
     { "\"foo blah\"",  "foox blahx",       false, 0, 0, 0, 0 },
     { "\"foo blah\"",  "foo blah",         true,  0, 8, 0, 0 },
     { "\"foo blah\"",  "\"foo blah\"",     true,  1, 9, 0, 0 },
     { "foo blah",      "\"foo bar blah\"", true,  1, 4, 9, 13 },
   };
   for (size_t i = 0; i < arraysize(data); ++i) {
     QueryParser parser;
-    ScopedVector<QueryNode> query_nodes;
+    query_parser::QueryNodeVector query_nodes;
     parser.ParseQueryNodes(base::UTF8ToUTF16(data[i].query),
-                           MatchingAlgorithm::DEFAULT,
-                           &query_nodes.get());
+                           MatchingAlgorithm::DEFAULT, &query_nodes);
     Snippet::MatchPositions match_positions;
     ASSERT_EQ(data[i].matches,
               parser.DoesQueryMatch(base::UTF8ToUTF16(data[i].text),
-                                    query_nodes.get(),
-                                    &match_positions));
+                                    query_nodes, &match_positions));
     size_t offset = 0;
     if (data[i].m1_start != 0 || data[i].m1_end != 0) {
       ASSERT_TRUE(match_positions.size() >= 1);
       EXPECT_EQ(data[i].m1_start, match_positions[0].first);
       EXPECT_EQ(data[i].m1_end, match_positions[0].second);
       offset++;
     }
     if (data[i].m2_start != 0 || data[i].m2_end != 0) {
       ASSERT_TRUE(match_positions.size() == 1 + offset);
       EXPECT_EQ(data[i].m2_start, match_positions[offset].first);
@@ skipping 24 matching lines @@
     ASSERT_EQ(data[i].word_count, results.size());
     EXPECT_EQ(data[i].w1, base::UTF16ToUTF8(results[0]));
     if (results.size() == 2)
       EXPECT_EQ(data[i].w2, base::UTF16ToUTF8(results[1]));
     if (results.size() == 3)
       EXPECT_EQ(data[i].w3, base::UTF16ToUTF8(results[2]));
   }
 }
 
 }  // namespace query_parser