Move the rest of the renderer->browser messages that belong in content. Also do a bunch of cleanup:

chrome/common/automation_messages.cc

Index: chrome/common/automation_messages.cc
===================================================================
--- chrome/common/automation_messages.cc	(revision 79188)
+++ chrome/common/automation_messages.cc	(working copy)
@@ -677,4 +677,21 @@
   l->append(")");
 }
 
+// The traits for these are defined in render_messages.h
+template <>
+struct ParamTraits<ContentSetting> {
+  typedef ContentSetting param_type;
+  static void Write(Message* m, const param_type& p);
+  static bool Read(const Message* m, void** iter, param_type* p);
+  static void Log(const param_type& p, std::string* l);
+};
+
+template <>
+struct ParamTraits<ContentSettingsType> {
+  typedef ContentSettingsType param_type;
+  static void Write(Message* m, const param_type& p);
+  static bool Read(const Message* m, void** iter, param_type* p);
+  static void Log(const param_type& p, std::string* l);
+};
+
 }  // namespace IPC