Add migration code to change existing domain scoped content settings to be origin scoped

components/content_settings/core/common/content_settings_pattern.h

 // Copyright (c) 2012 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 COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_CONTENT_SETTINGS_PATTERN_H_
 #define COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_CONTENT_SETTINGS_PATTERN_H_
 
 #include <string>
@@ skipping 111 matching lines @@
 
   // The version of the pattern format implemented.
   static const int kContentSettingsPatternVersion;
 
   // Returns a wildcard content settings pattern that matches all possible valid
   // origins.
   static ContentSettingsPattern Wildcard();
 
   // Returns a pattern that matches the scheme and host of this URL, as well as
   // all subdomains and ports.
   static ContentSettingsPattern FromURL(const GURL& url);

[raymes, 2016/06/20 04:03:26]

We should remove this at some point (when we've finished using it)

[lshang, 2016/06/23 01:32:32]

Done.
I added a TODO here.

 
   // Returns a pattern that matches exactly this URL.
   static ContentSettingsPattern FromURLNoWildcard(const GURL& url);
 
   // Returns a pattern that matches the given pattern specification.
   // Valid patterns specifications are:
   //   - [*.]domain.tld (matches domain.tld and all sub-domains)
   //   - host (matches an exact hostname)
   //   - scheme://host:port (supported schemes: http,https)
   //   - scheme://[*.]domain.tld:port (supported schemes: http,https)
   //   - file://path (The path has to be an absolute path and start with a '/')
   //   - a.b.c.d (matches an exact IPv4 ip)
   //   - [a:b:c:d:e:f:g:h] (matches an exact IPv6 ip)
   static ContentSettingsPattern FromString(const std::string& pattern_spec);
 
+  static ContentSettingsPattern FromDomainToOrigin(
+      const ContentSettingsPattern domain_pattern);

[raymes, 2016/06/20 04:03:26]

Could we get away with just having one new function? We could call it:
MigrateFromDomainToOrigin (it could be a member function or a static function,
whatever makes the code nicer). It could return a bool which is true if the
pattern was suitable to migrate and put the ContentSettingsPattern into an
out-param. 

We should also add a TODO which says to remove it when we remove the other
Migrate function (and probably file a bug about that)

[lshang, 2016/06/23 01:32:31]

Done.

+
   // Sets the scheme that doesn't support domain wildcard and port.
   // Needs to be called by the embedder before using ContentSettingsPattern.
   // |scheme| can't be NULL, and the pointed string must remain alive until the
   // app terminates.
   static void SetNonWildcardDomainNonPortScheme(const char* scheme);
 
   // Compares |scheme| against the scheme set by the embedder.
   static bool IsNonWildcardDomainNonPortScheme(const std::string& scheme);
 
   // Constructs an empty pattern. Empty patterns are invalid patterns. Invalid
   // patterns match nothing.
   ContentSettingsPattern();
 
   // 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;
 
   // True if this pattern matches all hosts (i.e. it has a host wildcard).
   bool MatchesAllHosts() const;
 
+  // True if this pattern is generated using FromURL().
+  bool IsGeneratedUsingFromURL() const;
+
   // Returns a std::string representation of this pattern.
   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;
 
@@ skipping 30 matching lines @@
       const ContentSettingsPattern::PatternParts& other_parts);
 
   ContentSettingsPattern(const PatternParts& parts, bool valid);
 
   PatternParts parts_;
 
   bool is_valid_;
 };
 
 #endif  // COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_CONTENT_SETTINGS_PATTERN_H_