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

chrome/common/automation_messages.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 "content/common/common_param_traits.h"
 
 #define IPC_MESSAGE_IMPL
 #include "chrome/common/automation_messages.h"
 
 AutomationURLRequest::AutomationURLRequest()
@@ skipping 659 matching lines @@
   LogParam(p.dimensions, l);
   l->append(", ");
   LogParam(p.disposition, l);
   l->append(", ");
   LogParam(p.user_gesture, l);
   l->append(",");
   LogParam(p.profile_name, l);
   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