| Index: chrome/common/content_settings_pattern.h
|
| diff --git a/chrome/common/content_settings_pattern.h b/chrome/common/content_settings_pattern.h
|
| index 7838141046611aa76d7be807213cb0e66bb1bb21..a93f3a989150939a40c0c9ea65d17329bce5d322 100644
|
| --- a/chrome/common/content_settings_pattern.h
|
| +++ b/chrome/common/content_settings_pattern.h
|
| @@ -145,11 +145,7 @@ class ContentSettingsPattern {
|
| // 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;
|
| -
|
| + // Public for serializing and sending |ContentSettingsPattern| over IPC.
|
| struct PatternParts {
|
| PatternParts();
|
| ~PatternParts();
|
| @@ -183,6 +179,13 @@ class ContentSettingsPattern {
|
| // scheme part.
|
| std::string path;
|
| };
|
| + PatternParts parts_;
|
| + bool is_valid_;
|
| +
|
| + private:
|
| + friend class content_settings::PatternParser;
|
| + friend class ContentSettingsPatternParserTest_SerializePatterns_Test;
|
| + friend class Builder;
|
|
|
| class Builder : public BuilderInterface {
|
| public:
|
| @@ -241,10 +244,6 @@ class ContentSettingsPattern {
|
| static bool Validate(const PatternParts& parts);
|
|
|
| ContentSettingsPattern(const PatternParts& parts, bool valid);
|
| -
|
| - PatternParts parts_;
|
| -
|
| - bool is_valid_;
|
| };
|
|
|
| // Stream operator so ContentSettingsPattern can be used in assertion
|
|
|