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"
 #include "base/strings/string_split.h"
 #include "chrome/common/content_settings_pattern_parser.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "extensions/common/constants.h"
 #include "googleurl/src/gurl.h"
 #include "googleurl/src/url_canon.h"
 #include "ipc/ipc_message_utils.h"
-#include "net/base/dns_util.h"
 #include "net/base/net_util.h"
 
 namespace {
 
 std::string GetDefaultPort(const std::string& scheme) {
   if (scheme == chrome::kHttpScheme)
     return "80";
   if (scheme == chrome::kHttpsScheme)
     return "443";
   return "";
@@ skipping 41 matching lines @@
   if (i1 > i2)
     return 1;
 
   if (i1 < i2)
     return -1;
 
   // The domain names are identical.
   return 0;
 }
 
+std::string TrimEndingDots(const base::StringPiece& host) {
+  size_t len = host.length();
+  while (len > 1 && host[len - 1] == '.') {
+    --len;
+  }
+  return host.substr(0, len).as_string();
+}
+
 typedef ContentSettingsPattern::BuilderInterface BuilderInterface;
 
 }  // namespace
 
 // ////////////////////////////////////////////////////////////////////////////
 // ContentSettingsPattern::Builder
 //
 ContentSettingsPattern::Builder::Builder(bool use_legacy_validate)
     : is_valid_(true),
       use_legacy_validate_(use_legacy_validate) {}
@@ skipping 80 matching lines @@
                std::string(content::kStandardSchemeSeparator) + parts->path);
       parts->path = url.path();
   }
 
   // Canonicalize the host part.
   const std::string host(parts->host);
   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);
+  canonicalized_host = TrimEndingDots(canonicalized_host);

[jochen (gone - plz use gerrit), 2013/04/02 08:09:36]

this change seems wrong. I'll comment on the bug report

[yhirano, 2013/04/02 17:38:24]

Done.

 
   parts->host = "";
   if ((host.find('*') == std::string::npos) &&
       !canonicalized_host.empty()) {
     // Valid host.
     parts->host += canonicalized_host;
   }
   return true;
 }
 
@@ skipping 249 matching lines @@
   // For filesystem:file URLs, the path used is the filesystem type, so all
   // filesystem:file:///temporary/... are equivalent.
   // TODO(markusheintz): Content settings should be defined for all files on
   // a machine. Unless there is a good use case for supporting paths for file
   // patterns, stop supporting path for file patterns.
   if (!parts_.is_scheme_wildcard && scheme == chrome::kFileScheme)
     return parts_.is_path_wildcard ||
         parts_.path == std::string(local_url->path());
 
   // Match the host part.
-  const std::string host(net::TrimEndingDot(local_url->host()));
+  const std::string host(TrimEndingDots(local_url->host()));
   if (!parts_.has_domain_wildcard) {
     if (parts_.host != host)
       return false;
   } else {
     if (!IsSubDomainOrEqual(host, parts_.host))
       return false;
   }
 
   // For chrome extensions URLs ignore the port.
   if (parts_.scheme == std::string(extensions::kExtensionScheme))
@@ skipping 198 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;
 }