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

-move safe browsing messages together
-get rid of webkit_param_traits and common_param_trait since they're no longer needed
-remove the multiple include of IPC files from places that don't need it

TBR=tsepez
Review URL: http://codereview.chromium.org/6713084

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79235 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 17 insertions, 89 deletions

diff --git a/chrome/common/render_messages.cc b/chrome/common/render_messages.cc
index 8076ea8..051e63f 100644
--- a/chrome/common/render_messages.cc
+++ b/chrome/common/render_messages.cc
@@ -2,38 +2,29 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Get basic type definitions.
-#define IPC_MESSAGE_IMPL
 #include "chrome/common/render_messages.h"
-#include "chrome/common/common_param_traits.h"
 
-// Generate constructors.
-#include "ipc/struct_constructor_macros.h"
-#include "chrome/common/render_messages.h"
-
-// Generate destructors.
-#include "ipc/struct_destructor_macros.h"
-#include "chrome/common/render_messages.h"
-
-// Generate param traits write methods.
-#include "ipc/param_traits_write_macros.h"
 namespace IPC {
-#include "chrome/common/render_messages.h"
-}  // namespace IPC
 
-// Generate param traits read methods.
-#include "ipc/param_traits_read_macros.h"
-namespace IPC {
-#include "chrome/common/render_messages.h"
-}  // 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]);
+}
 
-// Generate param traits log methods.
-#include "ipc/param_traits_log_macros.h"
-namespace IPC {
-#include "chrome/common/render_messages.h"
-}  // namespace IPC
+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;
+}
 
-namespace IPC {
+void ParamTraits<ContentSettings>::Log(
+    const ContentSettings& p, std::string* l) {
+  l->append("<ContentSettings>");
+}
 
 void ParamTraits<URLPattern>::Write(Message* m, const param_type& p) {
   WriteParam(m, p.valid_schemes());
@@ -77,67 +68,4 @@ void ParamTraits<ExtensionExtent>::Log(const param_type& p, std::string* l) {
   LogParam(p.patterns(), l);
 }
 
-void ParamTraits<webkit_glue::WebAccessibility>::Write(Message* m,
-                                                       const param_type& p) {
-  WriteParam(m, p.id);
-  WriteParam(m, p.name);
-  WriteParam(m, p.value);
-  WriteParam(m, static_cast<int>(p.role));
-  WriteParam(m, static_cast<int>(p.state));
-  WriteParam(m, p.location);
-  WriteParam(m, p.attributes);
-  WriteParam(m, p.children);
-  WriteParam(m, p.indirect_child_ids);
-  WriteParam(m, p.html_attributes);
-}
-
-bool ParamTraits<webkit_glue::WebAccessibility>::Read(
-    const Message* m, void** iter, param_type* p) {
-  bool ret = ReadParam(m, iter, &p->id);
-  ret = ret && ReadParam(m, iter, &p->name);
-  ret = ret && ReadParam(m, iter, &p->value);
-  int role = -1;
-  ret = ret && ReadParam(m, iter, &role);
-  if (role >= webkit_glue::WebAccessibility::ROLE_NONE &&
-      role < webkit_glue::WebAccessibility::NUM_ROLES) {
-    p->role = static_cast<webkit_glue::WebAccessibility::Role>(role);
-  } else {
-    p->role = webkit_glue::WebAccessibility::ROLE_NONE;
-  }
-  int state = 0;
-  ret = ret && ReadParam(m, iter, &state);
-  p->state = static_cast<webkit_glue::WebAccessibility::State>(state);
-  ret = ret && ReadParam(m, iter, &p->location);
-  ret = ret && ReadParam(m, iter, &p->attributes);
-  ret = ret && ReadParam(m, iter, &p->children);
-  ret = ret && ReadParam(m, iter, &p->indirect_child_ids);
-  ret = ret && ReadParam(m, iter, &p->html_attributes);
-  return ret;
-}
-
-void ParamTraits<webkit_glue::WebAccessibility>::Log(const param_type& p,
-                                                     std::string* l) {
-  l->append("(");
-  LogParam(p.id, l);
-  l->append(", ");
-  LogParam(p.name, l);
-  l->append(", ");
-  LogParam(p.value, l);
-  l->append(", ");
-  LogParam(static_cast<int>(p.role), l);
-  l->append(", ");
-  LogParam(static_cast<int>(p.state), l);
-  l->append(", ");
-  LogParam(p.location, l);
-  l->append(", ");
-  LogParam(p.attributes, l);
-  l->append(", ");
-  LogParam(p.children, l);
-  l->append(", ");
-  LogParam(p.html_attributes, l);
-  l->append(", ");
-  LogParam(p.indirect_child_ids, l);
-  l->append(")");
-}
-
 }  // namespace IPC