Merge 106270 - Check for default content settings when requiring user authorization for plug-ins.

chrome/common/content_settings_pattern.h

 // Copyright (c) 2011 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.
 
 // Patterns used in content setting rules.
 
 #ifndef CHROME_COMMON_CONTENT_SETTINGS_PATTERN_H_
 #define CHROME_COMMON_CONTENT_SETTINGS_PATTERN_H_
 #pragma once
 
 #include <ostream>
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/gtest_prod_util.h"
 
 class GURL;
 
 namespace content_settings {
 class PatternParser;
 }
 
+namespace IPC {
+class Message;
+}
+
 // A pattern used in content setting rules. See |IsValid| for a description of
 // possible patterns.
 class ContentSettingsPattern {
  public:
   // Each content settings pattern describes a set of origins. Patterns, and the
   // sets they describe, have specific relations. |Relation| describes the
   // relation of two patterns A and B. When pattern A is compared with pattern B
   // (A compare B) interesting relations are:
   // - IDENTITY:
   //   Pattern A and B are identical. The patterns are equal.
@@ skipping 16 matching lines @@
   //   Pattern A and B have an intersection. But pattern A has a higher
   //   precedence than pattern B for URLs that are matched by both pattern.
   enum Relation {
     DISJOINT_ORDER_POST = -2,
     SUCCESSOR = -1,
     IDENTITY = 0,
     PREDECESSOR = 1,
     DISJOINT_ORDER_PRE = 2,
   };
 
+  struct PatternParts {
+    PatternParts();
+    ~PatternParts();
+
+    // Lowercase string of the URL scheme to match. This string is empty if the
+    // |is_scheme_wildcard| flag is set.
+    std::string scheme;
+
+    // True if the scheme wildcard is set.
+    bool is_scheme_wildcard;
+
+    // Normalized string that is either of the following:
+    // - IPv4 or IPv6
+    // - hostname
+    // - domain
+    // - empty string if the |is_host_wildcard flag is set.
+    std::string host;
+
+    // True if the domain wildcard is set.
+    bool has_domain_wildcard;
+
+    // String with the port to match. This string is empty if the
+    // |is_port_wildcard| flag is set.
+    std::string port;
+
+    // True if the port wildcard is set.
+    bool is_port_wildcard;
+
+    // TODO(markusheintz): Needed for legacy reasons. Remove. Path
+    // specification. Only used for content settings pattern with a "file"
+    // scheme part.
+    std::string path;
+  };
+
   class BuilderInterface {
    public:
     virtual ~BuilderInterface() {}
 
     virtual BuilderInterface* WithPort(const std::string& port) = 0;
 
     virtual BuilderInterface* WithPortWildcard() = 0;
 
     virtual BuilderInterface* WithHost(const std::string& host) = 0;
 
@@ skipping 45 matching lines @@
   //   - [a:b:c:d:e:f:g:h] (matches an exact IPv6 ip)
   static ContentSettingsPattern FromString(const std::string& pattern_spec);
 
   static ContentSettingsPattern LegacyFromString(
       const std::string& pattern_spec);
 
   // Constructs an empty pattern. Empty patterns are invalid patterns. Invalid
   // patterns match nothing.
   ContentSettingsPattern();
 
+  // Serializes the pattern to an IPC message or deserializes it.
+  void WriteToMessage(IPC::Message* m) const;
+  bool ReadFromMessage(const IPC::Message* m, void** iter);
+
   // True if this is a valid pattern.
   bool IsValid() const { return is_valid_; }
 
   // True if |url| matches this pattern.
   bool Matches(const GURL& url) const;
 
   // Returns a std::string representation of this pattern.
   const std::string ToString() const;
 
   // Compares the pattern with a given |other| pattern and returns the
   // |Relation| of the two patterns.
   Relation Compare(const ContentSettingsPattern& other) const;
 
   // Returns true if the pattern and the |other| pattern are identical.
   bool operator==(const ContentSettingsPattern& other) const;
 
   // Returns true if the pattern and the |other| pattern are not identical.
   bool operator!=(const ContentSettingsPattern& other) const;
 
   // Returns true if the pattern has a lower priority than the |other| pattern.
   bool operator<(const ContentSettingsPattern& other) const;
 
   // Returns true if the pattern has a higher priority than the |other| pattern.
   bool operator>(const ContentSettingsPattern& other) const;
 
  private:
   friend class content_settings::PatternParser;
-  friend class ContentSettingsPatternParserTest_SerializePatterns_Test;
   friend class Builder;
-
-  struct PatternParts {
-    PatternParts();
-    ~PatternParts();
-
-    // Lowercase string of the URL scheme to match. This string is empty if the
-    // |is_scheme_wildcard| flag is set.
-    std::string scheme;
-
-    // True if the scheme wildcard is set.
-    bool is_scheme_wildcard;
-
-    // Normalized string that is either of the following:
-    // - IPv4 or IPv6
-    // - hostname
-    // - domain
-    // - empty string if the |is_host_wildcard flag is set.
-    std::string host;
-
-    // True if the domain wildcard is set.
-    bool has_domain_wildcard;
-
-    // String with the port to match. This string is empty if the
-    // |is_port_wildcard| flag is set.
-    std::string port;
-
-    // True if the port wildcard is set.
-    bool is_port_wildcard;
-
-    // TODO(markusheintz): Needed for legacy reasons. Remove. Path
-    // specification. Only used for content settings pattern with a "file"
-    // scheme part.
-    std::string path;
-  };
+  FRIEND_TEST_ALL_PREFIXES(ContentSettingsPatternParserTest, SerializePatterns);
 
   class Builder : public BuilderInterface {
     public:
      explicit Builder(bool use_legacy_validate);
      virtual ~Builder();
 
      // Overrides BuilderInterface
      virtual BuilderInterface* WithPort(const std::string& port);
 
      virtual BuilderInterface* WithPortWildcard();
@@ skipping 52 matching lines @@
 };
 
 // Stream operator so ContentSettingsPattern can be used in assertion
 // statements.
 inline std::ostream& operator<<(
     std::ostream& out, const ContentSettingsPattern& pattern) {
   return out << pattern.ToString();
 }
 
 #endif  // CHROME_COMMON_CONTENT_SETTINGS_PATTERN_H_