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

components/content_settings/core/common/content_settings_pattern.cc

 // 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.
 
 #include "components/content_settings/core/common/content_settings_pattern.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <vector>
@@ skipping 421 matching lines @@
 ContentSettingsPattern ContentSettingsPattern::FromString(
     const std::string& pattern_spec) {
   std::unique_ptr<ContentSettingsPattern::BuilderInterface> builder(
       ContentSettingsPattern::CreateBuilder(false));
   content_settings::PatternParser::Parse(pattern_spec,
                                          builder.get());
   return builder->Build();
 }
 
 // static
+bool ContentSettingsPattern::MigrateFromDomaintoOrigin(

[raymes, 2016/06/27 07:23:29]

MigrateFromDomainToOrigin

(capital T)

[lshang, 2016/06/28 07:14:41]

Done.

+    const ContentSettingsPattern& domain_pattern,
+    ContentSettingsPattern* origin_pattern) {
+  DCHECK(origin_pattern);
+
+  // First test if the domain pattern is generated using FromURL().

[raymes, 2016/06/27 07:23:29]

nit: remove this line, I think it should be clear enough

[lshang, 2016/06/28 07:14:41]

Done.

+  // Generated patterns must either have a scheme wildcard or be https.
+  if (domain_pattern.parts_.scheme != url::kHttpsScheme &&
+      !domain_pattern.parts_.is_scheme_wildcard)

[raymes, 2016/06/27 07:23:29]

nit: add {}

[lshang, 2016/06/28 07:14:41]

Done.

+    return false;
+
+  // Generated patterns will either have a port wildcard or be https (but not
+  // both).
+  if (domain_pattern.parts_.is_port_wildcard &&
+      domain_pattern.parts_.scheme == url::kHttpsScheme)

[raymes, 2016/06/27 07:23:29]

nit: add {}

[lshang, 2016/06/28 07:14:41]

Done.

+    return false;
+
+  // Generated patterns will always have a domain wildcard.
+  if (!domain_pattern.parts_.has_domain_wildcard)
+    return false;
+
+  // Generated patterns will always have a host.
+  if (domain_pattern.parts_.host.empty())
+    return false;
+
+  // Then migrate it to be origin scoped.
+  *origin_pattern = domain_pattern;
+
+  if (domain_pattern.parts_.is_scheme_wildcard) {
+    (*origin_pattern).parts_.scheme = url::kHttpScheme;
+    (*origin_pattern).parts_.is_scheme_wildcard = false;
+  }
+  if (domain_pattern.parts_.has_domain_wildcard)

[raymes, 2016/06/27 07:23:29]

I think we know this will be true, so we can remove this check

[lshang, 2016/06/28 07:14:41]

Done.

+    (*origin_pattern).parts_.has_domain_wildcard = false;
+  if (domain_pattern.parts_.is_port_wildcard) {
+    (*origin_pattern).parts_.port =
+        GetDefaultPort((*origin_pattern).parts_.scheme);
+    (*origin_pattern).parts_.is_port_wildcard = false;
+  }
+  return true;
+}
+
+// static
 void ContentSettingsPattern::SetNonWildcardDomainNonPortScheme(
     const char* scheme) {
   DCHECK(scheme);
   DCHECK(!non_port_non_domain_wildcard_scheme ||
          non_port_non_domain_wildcard_scheme == scheme);
   non_port_non_domain_wildcard_scheme = scheme;
 }
 
 // static
 bool ContentSettingsPattern::IsNonWildcardDomainNonPortScheme(
@@ skipping 285 matching lines @@
   if (!parts.is_path_wildcard && other_parts.is_path_wildcard)
     return ContentSettingsPattern::PREDECESSOR;
 
   int result = parts.path.compare(other_parts.path);
   if (result == 0)
     return ContentSettingsPattern::IDENTITY;
   if (result > 0)
     return ContentSettingsPattern::DISJOINT_ORDER_PRE;
   return ContentSettingsPattern::DISJOINT_ORDER_POST;
 }