Revert my change to get the tree green. Not sure why the tests became flaky....

chrome/common/render_messages_internal.h

Index: chrome/common/render_messages_internal.h
===================================================================
--- chrome/common/render_messages_internal.h	(revision 9131)
+++ chrome/common/render_messages_internal.h	(working copy)
@@ -25,6 +25,8 @@
 #include "webkit/glue/webinputevent.h"
 #include "webkit/glue/webplugin.h"
 
+void RenderMessagesInit();
+
 // TODO(mpcomplete): rename ViewMsg and ViewHostMsg to something that makes
 // more sense with our current design.
 
@@ -32,7 +34,7 @@
 // RenderView messages
 // These are messages sent from the browser to the renderer process.
 
-IPC_BEGIN_MESSAGES(View)
+IPC_BEGIN_MESSAGES(View, 1)
   // Used typically when recovering from a crash.  The new rendering process
   // sets its global "next page id" counter to the given value.
   IPC_MESSAGE_CONTROL1(ViewMsg_SetNextPageID,
@@ -484,7 +486,7 @@
 // WebContents messages
 // These are messages sent from the renderer to the browser process.
 
-IPC_BEGIN_MESSAGES(ViewHost)
+IPC_BEGIN_MESSAGES(ViewHost, 2)
   // Sent by the renderer when it is creating a new window.  The browser creates
   // a tab for it and responds with a ViewMsg_CreatingNew_ACK.  If route_id is
   // MSG_ROUTING_NONE, the view couldn't be created.  modal_dialog_event is set
@@ -736,11 +738,9 @@
   IPC_MESSAGE_CONTROL3(ViewHostMsg_PageContents, GURL, int32, std::wstring)
 
   // Specifies the URL as the first parameter (a wstring) and thumbnail as
-  // binary data as the second parameter.
-  IPC_MESSAGE_ROUTED3(ViewHostMsg_Thumbnail,
-                      GURL /* url */,
-                      ThumbnailScore /* score */,
-                      SkBitmap /* bitmap */)
+  // binary data as the second parameter. Our macros don't handle binary data,
+  // so this is declared "empty," to be encoded by the caller/receiver.
+  IPC_MESSAGE_EMPTY(ViewHostMsg_Thumbnail)
 
   // Notification that the url for the favicon of a site has been determined.
   IPC_MESSAGE_ROUTED2(ViewHostMsg_UpdateFavIconURL,