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 156 matching lines @@
 
   if (parts->scheme == std::string(chrome::kFileScheme) &&
       !parts->is_path_wildcard) {
       GURL url(std::string(chrome::kFileScheme) +
                std::string(content::kStandardSchemeSeparator) + parts->path);
       parts->path = url.path();
   }
 
   // Canonicalize the host part.
   const std::string host(parts->host);
+  if (host.size() >= 2 &&
+      host[host.size() - 1] == '.' &&

[markusheintz_, 2013/04/02 19:16:46]

What about a..a?

Please move this logic to the chrome/common/content_settings_pattern_parser.cc
which is responsible for parsing strings to content settings patters.

(see CL 13470012 as an example).

[yhirano, 2013/04/02 19:54:54]

Done.

+      host[host.size() - 2] == '.') {
+    // There are multiple ending dots.
+    return false;
+  }
+
   url_canon::CanonHostInfo host_info;
   std::string canonicalized_host(net::CanonicalizeHost(host, &host_info));
   if (host_info.IsIPAddress() && parts->has_domain_wildcard)
     return false;
   canonicalized_host = net::TrimEndingDot(canonicalized_host);
 
   parts->host = "";
   if ((host.find('*') == std::string::npos) &&
       !canonicalized_host.empty()) {
     // Valid host.
@@ skipping 473 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;
 }