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

chrome/browser/resource_message_filter.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/resource_message_filter.h"
 
 #include "base/clipboard.h"
 #include "base/gfx/native_widget_types.h"
 #include "base/histogram.h"
 #include "base/thread.h"
 #include "chrome/browser/chrome_plugin_browsing_context.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/net/dns_global.h"
 #include "chrome/browser/printing/print_job_manager.h"
 #include "chrome/browser/printing/printer_query.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/plugin_service.h"
 #include "chrome/browser/renderer_host/browser_render_process_host.h"
 #include "chrome/browser/renderer_host/render_widget_helper.h"
 #include "chrome/browser/spellchecker.h"
 #include "chrome/common/chrome_plugin_lib.h"
 #include "chrome/common/chrome_plugin_util.h"
 #include "chrome/common/clipboard_service.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
+#include "chrome/common/ipc_message_macros.h"
 #include "chrome/common/render_messages.h"
 #include "net/base/cookie_monster.h"
 #include "net/base/mime_util.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webplugin.h"
 
 namespace {
 
 // Context menus are somewhat complicated. We need to intercept them here on
 // the I/O thread to add any spelling suggestions to them. After that's done,
@@ skipping 188 matching lines @@
     BrowserRenderProcessHost::BadMessageTerminateProcess(message.type(),
                                                          render_handle_);
   }
 
   return handled;
 }
 
 void ResourceMessageFilter::OnReceiveContextMenuMsg(const IPC::Message& msg) {
   void* iter = NULL;
   ViewHostMsg_ContextMenu_Params params;
-  if (!ParamTraits<ViewHostMsg_ContextMenu_Params>::
+  if (!IPC::ParamTraits<ViewHostMsg_ContextMenu_Params>::
       Read(&msg, &iter, &params))
     return;
 
   // Fill in the dictionary suggestions if required.
   if (!params.misspelled_word.empty() &&
       spellchecker_ != NULL && params.spellcheck_enabled) {
     int misspell_location, misspell_length;
     bool is_misspelled = !spellchecker_->SpellCheckWord(
         params.misspelled_word.c_str(),
         static_cast<int>(params.misspelled_word.length()),
@@ skipping 485 matching lines @@
   if (type == NotificationType::SPELLCHECKER_REINITIALIZED) {
     spellchecker_ = Details<SpellcheckerReinitializedDetails>
         (details).ptr()->spellchecker;
   }
 }
 
 void ResourceMessageFilter::OnDnsPrefetch(
     const std::vector<std::string>& hostnames) {
   chrome_browser_net::DnsPrefetchList(hostnames);
 }