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

chrome/common/content_settings_pattern.cc

Index: chrome/common/content_settings_pattern.cc
diff --git a/chrome/common/content_settings_pattern.cc b/chrome/common/content_settings_pattern.cc
index b15f73226f8cccf75b5ff22d6e56f0faf99755f3..05a0fe9aa8e7fac34cde5e06fcb69de6a37fca51 100644
--- a/chrome/common/content_settings_pattern.cc
+++ b/chrome/common/content_settings_pattern.cc
@@ -10,11 +10,13 @@
 #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 {
 
@@ -368,6 +370,17 @@ ContentSettingsPattern::ContentSettingsPattern(
       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.