Fix b180514: Some exception entries cannot be deleted from a setting panel.

chrome/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 "chrome/common/content_settings_pattern.h"
 
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
@@ skipping 138 matching lines @@
 ContentSettingsPattern ContentSettingsPattern::Builder::Build() {
   if (!is_valid_)
     return ContentSettingsPattern();
   if (!Canonicalize(&parts_))
     return ContentSettingsPattern();
   if (use_legacy_validate_) {
     is_valid_ = LegacyValidate(parts_);
   } else {
     is_valid_ = Validate(parts_);
   }
+  if (!is_valid_)
+    return ContentSettingsPattern(parts_, is_valid_);

[jochen (gone - plz use gerrit), 2013/04/05 11:23:47]

nit. just return ContentSettingsPattern()

[yhirano, 2013/04/08 00:37:45]

Done.

+
+  // A pattern is invalid if canonicalization is not idempotent.
+  // This check is here because it should be checked no matter
+  // use_legacy_validate_ is.
+  PatternParts parts(parts_);
+  if (!Canonicalize(&parts))
+    return ContentSettingsPattern();
+  if (ContentSettingsPattern(parts_, true) !=
+      ContentSettingsPattern(parts, true))
+    return ContentSettingsPattern();

[jochen (gone - plz use gerrit), 2013/04/05 11:23:47]

nit { } around body since the if condition is multiline

[yhirano, 2013/04/08 00:37:45]

Done.

+
   return ContentSettingsPattern(parts_, is_valid_);
 }
 
 // static
 bool ContentSettingsPattern::Builder::Canonicalize(PatternParts* parts) {
   // Canonicalize the scheme part.
   const std::string scheme(StringToLowerASCII(parts->scheme));
   parts->scheme = scheme;
 
   if (parts->scheme == std::string(chrome::kFileScheme) &&
@@ skipping 491 matching lines @@
   if (!parts.is_port_wildcard && other_parts.is_port_wildcard)
     return ContentSettingsPattern::PREDECESSOR;
 
   int result = parts.port.compare(other_parts.port);
   if (result == 0)
     return ContentSettingsPattern::IDENTITY;
   if (result > 0)
     return ContentSettingsPattern::DISJOINT_ORDER_PRE;
   return ContentSettingsPattern::DISJOINT_ORDER_POST;
 }