Commiting the changes from my previous cl that are specific to not including ...

chrome/browser/renderer_host/render_view_host.cc

 // 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.
 
 #include "chrome/browser/renderer_host/render_view_host.h"
 
 #include <string>
 #include <vector>
 
 #include "base/gfx/native_widget_types.h"
 #include "base/string_util.h"
 #include "base/waitable_event.h"
 #include "chrome/app/result_codes.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/cross_site_request_manager.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/renderer_host/renderer_security_policy.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_view_host_delegate.h"
 #include "chrome/browser/renderer_host/render_widget_host.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/site_instance.h"
 #include "chrome/browser/tab_contents/web_contents.h"
+#include "chrome/common/render_messages.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/common/thumbnail_score.h"
 #include "net/base/net_util.h"
 #include "skia/include/SkBitmap.h"
 #include "webkit/glue/autofill_form.h"
 
 #if defined(OS_WIN)
 // TODO(port): remove these when stubs are filled in
 #include "chrome/browser/debugger/debugger_wrapper.h"
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
@@ skipping 628 matching lines @@
     IPC_MESSAGE_HANDLER(ViewHostMsg_ShowView, OnMsgShowView)
     IPC_MESSAGE_HANDLER(ViewHostMsg_ShowWidget, OnMsgShowWidget)
     IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_RunModal, OnMsgRunModal)
     IPC_MESSAGE_HANDLER(ViewHostMsg_RendererReady, OnMsgRendererReady)
     IPC_MESSAGE_HANDLER(ViewHostMsg_RendererGone, OnMsgRendererGone)
     IPC_MESSAGE_HANDLER_GENERIC(ViewHostMsg_FrameNavigate, OnMsgNavigate(msg))
     IPC_MESSAGE_HANDLER(ViewHostMsg_UpdateState, OnMsgUpdateState)
     IPC_MESSAGE_HANDLER(ViewHostMsg_UpdateTitle, OnMsgUpdateTitle)
     IPC_MESSAGE_HANDLER(ViewHostMsg_UpdateEncoding, OnMsgUpdateEncoding)
     IPC_MESSAGE_HANDLER(ViewHostMsg_UpdateTargetURL, OnMsgUpdateTargetURL)
-    IPC_MESSAGE_HANDLER_GENERIC(ViewHostMsg_Thumbnail, OnMsgThumbnail(msg))
+    IPC_MESSAGE_HANDLER(ViewHostMsg_Thumbnail, OnMsgThumbnail)
     IPC_MESSAGE_HANDLER(ViewHostMsg_Close, OnMsgClose)
     IPC_MESSAGE_HANDLER(ViewHostMsg_RequestMove, OnMsgRequestMove)
     IPC_MESSAGE_HANDLER(ViewHostMsg_DidStartLoading, OnMsgDidStartLoading)
     IPC_MESSAGE_HANDLER(ViewHostMsg_DidStopLoading, OnMsgDidStopLoading)
     IPC_MESSAGE_HANDLER(ViewHostMsg_DidLoadResourceFromMemoryCache,
                         OnMsgDidLoadResourceFromMemoryCache)
     IPC_MESSAGE_HANDLER(ViewHostMsg_DidRedirectProvisionalLoad,
                         OnMsgDidRedirectProvisionalLoad)
     IPC_MESSAGE_HANDLER(ViewHostMsg_DidStartProvisionalLoadForFrame,
                         OnMsgDidStartProvisionalLoadForFrame)
@@ skipping 200 matching lines @@
 
 void RenderViewHost::OnMsgUpdateTargetURL(int32 page_id,
                                           const GURL& url) {
   delegate_->UpdateTargetURL(page_id, url);
 
   // Send a notification back to the renderer that we are ready to
   // receive more target urls.
   Send(new ViewMsg_UpdateTargetURL_ACK(routing_id()));
 }
 
-void RenderViewHost::OnMsgThumbnail(const IPC::Message& msg) {
-  // crack the message
-  void* iter = NULL;
-  GURL url;
-  if (!IPC::ParamTraits<GURL>::Read(&msg, &iter, &url))
-    return;
-
-  ThumbnailScore score;
-  if (!IPC::ParamTraits<ThumbnailScore>::Read(&msg, &iter, &score))
-    return;
-
-  // thumbnail data
-  SkBitmap bitmap;
-  if (!IPC::ParamTraits<SkBitmap>::Read(&msg, &iter, &bitmap))
-    return;
-
+void RenderViewHost::OnMsgThumbnail(const GURL& url,
+                                    const ThumbnailScore& score,
+                                    const SkBitmap& bitmap) {
   delegate_->UpdateThumbnail(url, bitmap, score);
 }
 
 void RenderViewHost::OnMsgClose() {
   delegate_->Close(this);
 }
 
 void RenderViewHost::OnMsgRequestMove(const gfx::Rect& pos) {
   delegate_->RequestMove(pos);
 }
@@ skipping 378 matching lines @@
                                                std::string event_arg) {
   Send(new ViewMsg_PersonalizationEvent(routing_id(), event_name, event_arg));
 }
 #endif
 
 void RenderViewHost::ForwardMessageFromExternalHost(
     const std::string& target, const std::string& message) {
   Send(new ViewMsg_HandleMessageFromExternalHost(routing_id(), target,
                                                  message));
 }