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

chrome/common/render_messages_internal.h

 // Copyright (c) 2006-2008 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.
 
 // This header is meant to be included in multiple passes, hence no traditional
 // header guard.
 // See ipc_message_macros.h for explanation of the macros and passes.
 
 #include <string>
 #include <vector>
 
 #include "build/build_config.h"
 
 #include "base/clipboard.h"
 #include "base/gfx/rect.h"
 #include "base/gfx/native_widget_types.h"
 #include "base/shared_memory.h"
 #include "chrome/common/ipc_message_macros.h"
 #include "skia/include/SkBitmap.h"
 #include "webkit/glue/console_message_level.h"
 #include "webkit/glue/context_node_types.h"
 #include "webkit/glue/dom_operations.h"
 #include "webkit/glue/screen_info.h"
 #include "webkit/glue/webcursor.h"
 #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.
 
 //-----------------------------------------------------------------------------
 // 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,
                        int32 /* next_page_id */)
 
   // Tells the renderer to create a new view.
   // This message is slightly different, the view it takes is the view to
   // create, the message itself is sent as a non-view control message.
   IPC_MESSAGE_CONTROL4(ViewMsg_New,
                        gfx::NativeViewId, /* parent window */
@@ skipping 431 matching lines @@
   IPC_MESSAGE_ROUTED1(ViewMsg_PopupNotificationVisiblityChanged,
                       bool /* Whether it is visible */)
 
 IPC_END_MESSAGES(View)
 
 
 //-----------------------------------------------------------------------------
 // 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
   // by the browser when a modal dialog is shown.
   IPC_SYNC_MESSAGE_CONTROL2_2(ViewHostMsg_CreateWindow,
                               int /* opener_id */,
                               bool /* user_gesture */,
                               int /* route_id */,
                               ModalDialogEvent /* modal_dialog_event */)
 
@@ skipping 231 matching lines @@
                              std::wstring /* in - default prompt */,
                              int          /* in - dialog flags */,
                              bool         /* out - success */,
                              std::wstring /* out - prompt field */)
 
   // Sets the contents for the given page (URL and page ID are the first two
   // arguments) given the contents that is the 3rd.
   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,
                       int32 /* page_id */,
                       GURL /* url of the favicon */)
 
   // Used to tell the parent that the user right clicked on an area of the
   // content area, and a context menu should be shown for it. The params
   // object contains information about the node(s) that were selected when the
   // user right clicked.
@@ skipping 348 matching lines @@
 
   // Get the list of proxies to use for |url|, as a semicolon delimited list
   // of "<TYPE> <HOST>:<PORT>" | "DIRECT". See also
   // PluginProcessHostMsg_ResolveProxy which does the same thing.
   IPC_SYNC_MESSAGE_CONTROL1_2(ViewHostMsg_ResolveProxy,
                               GURL /* url */,
                               int /* network error */,
                               std::string /* proxy list */)
 
 IPC_END_MESSAGES(ViewHost)