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

components/url_matcher/regex_set_matcher.cc

 // Copyright 2013 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/url_matcher/regex_set_matcher.h"
 
 #include <stddef.h>
 
 #include "base/logging.h"
-#include "base/stl_util.h"
+#include "base/memory/ptr_util.h"
 #include "base/strings/string_util.h"
 #include "components/url_matcher/substring_set_matcher.h"
 #include "third_party/re2/src/re2/filtered_re2.h"
 #include "third_party/re2/src/re2/re2.h"
 
 namespace url_matcher {
 
 RegexSetMatcher::RegexSetMatcher() {}
 
 RegexSetMatcher::~RegexSetMatcher() {
@@ skipping 74 matching lines @@
 
   std::vector<std::string> strings_to_match;
   filtered_re2_->Compile(&strings_to_match);
 
   substring_matcher_.reset(new SubstringSetMatcher);
   DeleteSubstringPatterns();
   // Build SubstringSetMatcher from |strings_to_match|.
   // SubstringSetMatcher doesn't own its strings.
   for (size_t i = 0; i < strings_to_match.size(); ++i) {
     substring_patterns_.push_back(
-        new StringPattern(strings_to_match[i], i));
+        base::MakeUnique<StringPattern>(strings_to_match[i], i));
   }
-  substring_matcher_->RegisterPatterns(substring_patterns_);
+  std::vector<const StringPattern*> patterns;
+  for (const auto& pattern : substring_patterns_)
+    patterns.push_back(pattern.get());
+  substring_matcher_->RegisterPatterns(patterns);
 }
 
 void RegexSetMatcher::DeleteSubstringPatterns() {

[battre, 2016/10/24 11:32:16]

I think here should go call to substring_patterns_.clear(); Otherwise, the
vector keeps growing.

[Avi (use Gerrit), 2016/10/24 14:38:06]

Agreed. I missed that this wasn't a destructor.

-  base::STLDeleteElements(&substring_patterns_);
 }
 
 }  // namespace url_matcher