Include port when creating a pattern for a HTTPS URL

chrome/browser/content_settings/host_content_settings_map.cc

 // Copyright (c) 2011 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/browser/content_settings/host_content_settings_map.h"
 
 #include "base/command_line.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/content_settings/content_settings_extension_provider.h"
@@ skipping 348 matching lines @@
     const GURL& secondary_url,
     ContentSettingsType content_type,
     const std::string& resource_identifier,
     ContentSetting setting) {
   // TODO(markusheintz): Until the UI supports pattern pairs, both urls must
   // match.
   DCHECK(primary_url == secondary_url);
 
   // Make sure there is no entry that would override the pattern we are about
   // to insert for exactly this URL.
+
+  // TODO(markusheintz): For cookies, the pattern and wildcard parameter need
+  // to be switched.

[Bernhard Bauer, 2011/06/22 09:49:11]

It should be correct this way; we switched to primary and secondary URLs and
patterns instead of top-level/embedded exactly to get that right (as in: the
primary URL for cookies is the cookie URL, while for most other types it's the
top-level frame URL, and we add wildcards for the secondary URL).

[markusheintz_, 2011/06/22 10:53:08]

+1 for Bernhard's comment.

That's way easier to maintain as the host content settings map should not need
to care about the semantics of the primary and secondary pattern.

   SetContentSetting(ContentSettingsPattern::FromURLNoWildcard(primary_url),
                     ContentSettingsPattern::Wildcard(),
                     content_type,
                     resource_identifier,
                     CONTENT_SETTING_DEFAULT);
 
   SetContentSetting(ContentSettingsPattern::FromURL(primary_url),
                     ContentSettingsPattern::Wildcard(),
                     content_type,
                     resource_identifier,
@@ skipping 155 matching lines @@
         SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_COOKIES,
             (cookie_behavior == net::StaticCookiePolicy::BLOCK_ALL_COOKIES) ?
                 CONTENT_SETTING_BLOCK : CONTENT_SETTING_ALLOW);
     }
     if (!prefs->HasPrefPath(prefs::kBlockThirdPartyCookies)) {
       SetBlockThirdPartyCookies(cookie_behavior ==
           net::StaticCookiePolicy::BLOCK_SETTING_THIRD_PARTY_COOKIES);
     }
   }
 }