Merge 106270 - Check for default content settings when requiring user authorization for plug-ins.

chrome/common/content_settings_pattern.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/common/content_settings_pattern.h"
 
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "chrome/common/content_settings_pattern_parser.h"
+#include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "net/base/dns_util.h"
 #include "net/base/net_util.h"
 #include "googleurl/src/gurl.h"
 #include "googleurl/src/url_canon.h"
+#include "ipc/ipc_message_utils.h"
 
 namespace {
 
 std::string GetDefaultPort(const std::string& scheme) {
   if (scheme == chrome::kHttpScheme)
     return "80";
   if (scheme == chrome::kHttpsScheme)
     return "443";
   return "";
 }
@@ skipping 333 matching lines @@
   : is_valid_(false) {
 }
 
 ContentSettingsPattern::ContentSettingsPattern(
     const PatternParts& parts,
     bool valid)
     : parts_(parts),
       is_valid_(valid) {
 }
 
+void ContentSettingsPattern::WriteToMessage(IPC::Message* m) const {
+  IPC::WriteParam(m, is_valid_);
+  IPC::WriteParam(m, parts_);
+}
+
+bool ContentSettingsPattern::ReadFromMessage(const IPC::Message* m,
+                                             void** iter) {
+  return IPC::ReadParam(m, iter, &is_valid_) &&
+         IPC::ReadParam(m, iter, &parts_);
+}
+
 bool ContentSettingsPattern::Matches(
     const GURL& url) const {
   // An invalid pattern matches nothing.
   if (!is_valid_)
     return false;
 
   // Match the scheme part.
   const std::string scheme(url.scheme());
   if (!parts_.is_scheme_wildcard &&
       parts_.scheme != scheme) {
@@ skipping 220 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;
 }