Revert 56059 - Merge 55103 - Refactored extension privilege enumeration and i...

chrome/common/extensions/url_pattern.h

 // Copyright (c) 2006-2009 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 CHROME_COMMON_EXTENSIONS_URL_PATTERN_H_
 #define CHROME_COMMON_EXTENSIONS_URL_PATTERN_H_
 
-#include <functional>
 #include <string>
 #include <vector>
 
 #include "googleurl/src/gurl.h"
 
 // A pattern that can be used to match URLs. A URLPattern is a very restricted
 // subset of URL syntax:
 //
 // <url-pattern> := <scheme>://<host><path> | '<all_urls>'
 // <scheme> := '*' | 'http' | 'https' | 'file' | 'ftp' | 'chrome'
@@ skipping 139 matching lines @@
   // instance. This method is symmetrical: Calling other.OverlapsWith(this)
   // would result in the same answer.
   bool OverlapsWith(const URLPattern& other) const;
 
   // Conver this URLPattern into an equivalent set of URLPatterns that don't use
   // a wildcard in the scheme component. If this URLPattern doesn't use a
   // wildcard scheme, then the returned set will contain one element that is
   // equivalent to this instance.
   std::vector<URLPattern> ConvertToExplicitSchemes() const;
 
-  static bool EffectiveHostCompare(const URLPattern& a, const URLPattern& b) {
-    if (a.match_all_urls_ && b.match_all_urls_)
-      return false;
-    return a.host_.compare(b.host_) < 0;
-  };
-
-  // Used for origin comparisons in a std::set.
-  class EffectiveHostCompareFunctor :
-      public std::binary_function<URLPattern, URLPattern, bool> {
-  public:
-    bool operator()(const URLPattern& a, const URLPattern& b) const {
-      return EffectiveHostCompare(a, b);
-    };
-  };
-
  private:
   // A bitmask containing the schemes which are considered valid for this
   // pattern. Parse() uses this to decide whether a pattern contains a valid
   // scheme. MatchesScheme uses this to decide whether a wildcard scheme_
   // matches a given test scheme.
   int valid_schemes_;
 
   // True if this is a special-case "<all_urls>" pattern.
   bool match_all_urls_;
 
@@ skipping 11 matching lines @@
   // everything after the scheme in the case of file:// URLs.
   std::string path_;
 
   // The path with "?" and "\" characters escaped for use with the
   // MatchPatternASCII() function. This is populated lazily, the first time it
   // is needed.
   mutable std::string path_escaped_;
 };
 
 #endif  // CHROME_COMMON_EXTENSIONS_URL_PATTERN_H_