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

components/url_matcher/url_matcher.h

 // 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.
 
 #ifndef COMPONENTS_URL_MATCHER_URL_MATCHER_H_
 #define COMPONENTS_URL_MATCHER_URL_MATCHER_H_
 
 #include <stddef.h>
 
 #include <memory>
@@ skipping 197 matching lines @@
   // Note that substring patterns and regex patterns will use different IDs.
   int id_counter_;
 
   // This comparison considers only the pattern() value of the
   // StringPatterns.
   struct StringPatternPointerCompare {
     bool operator()(StringPattern* lhs, StringPattern* rhs) const;
   };
   // Set to ensure that we generate only one StringPattern for each content
   // of StringPattern::pattern().
-  typedef std::set<StringPattern*, StringPatternPointerCompare>
-      PatternSingletons;
+  using PatternSingletons = std::map<StringPattern*,
+                                     std::unique_ptr<StringPattern>,
+                                     StringPatternPointerCompare>;
   PatternSingletons substring_pattern_singletons_;
   PatternSingletons regex_pattern_singletons_;
   PatternSingletons origin_and_path_regex_pattern_singletons_;
 
   DISALLOW_COPY_AND_ASSIGN(URLMatcherConditionFactory);
 };
 
 // This class represents a single URL query matching condition. The query
 // matching is done as a search for a key and optionally a value.
 // The matching makes use of CanonicalizeURLForComponentSearches to ensure that
@@ skipping 196 matching lines @@
   RegexSetMatcher origin_and_path_regex_set_matcher_;
   std::set<const StringPattern*> registered_full_url_patterns_;
   std::set<const StringPattern*> registered_url_component_patterns_;
 
   DISALLOW_COPY_AND_ASSIGN(URLMatcher);
 };
 
 }  // namespace url_matcher
 
 #endif  // COMPONENTS_URL_MATCHER_URL_MATCHER_H_