Take script URLs into account when applying script content settings.

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 39c6705e036af5a0c9c369562093d493ab3ec43a..726f082680cff075aed2ab735233e7dfac937382 100644
--- a/chrome/common/render_messages.cc
+++ b/chrome/common/render_messages.cc
@@ -6,26 +6,6 @@
 
 namespace IPC {
 
-void ParamTraits<ContentSettings>::Write(
-    Message* m, const ContentSettings& settings) {
-  for (size_t i = 0; i < arraysize(settings.settings); ++i)
-    WriteParam(m, settings.settings[i]);
-}
-
-bool ParamTraits<ContentSettings>::Read(
-    const Message* m, void** iter, ContentSettings* r) {
-  for (size_t i = 0; i < arraysize(r->settings); ++i) {
-    if (!ReadParam(m, iter, &r->settings[i]))
-      return false;
-  }
-  return true;
-}
-
-void ParamTraits<ContentSettings>::Log(
-    const ContentSettings& p, std::string* l) {
-  l->append("<ContentSettings>");
-}
-
 void ParamTraits<ContentSettingsPattern>::Write(
     Message* m, const ContentSettingsPattern& pattern) {
   pattern.WriteToMessage(m);