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

chrome/common/render_messages.cc

Index: chrome/common/render_messages.cc
diff --git a/chrome/common/render_messages.cc b/chrome/common/render_messages.cc
index 7fd44d492f1b03e91dfc28e3b59f2d130afa929b..39c6705e036af5a0c9c369562093d493ab3ec43a 100644
--- a/chrome/common/render_messages.cc
+++ b/chrome/common/render_messages.cc
@@ -26,4 +26,21 @@ void ParamTraits<ContentSettings>::Log(
   l->append("<ContentSettings>");
 }
 
+void ParamTraits<ContentSettingsPattern>::Write(
+    Message* m, const ContentSettingsPattern& pattern) {
+  pattern.WriteToMessage(m);
+}
+
+bool ParamTraits<ContentSettingsPattern>::Read(
+    const Message* m, void** iter, ContentSettingsPattern* pattern) {
+  return pattern->ReadFromMessage(m, iter);
+}
+
+void ParamTraits<ContentSettingsPattern>::Log(
+    const ContentSettingsPattern& p, std::string* l) {
+  l->append("<ContentSettingsPattern: ");
+  l->append(p.ToString());
+  l->append(">");
+}
+
 }  // namespace IPC