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

chrome/browser/tab_contents/ipc_status_view.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.
 
-// Need to include this before any other file because it defines
-// IPC_MESSAGE_LOG_ENABLED.
-#include "chrome/common/ipc_message.h"
-
-#ifdef IPC_MESSAGE_LOG_ENABLED
-#define IPC_MESSAGE_MACROS_LOG_ENABLED
-
 #include "chrome/browser/tab_contents/ipc_status_view.h"
 
 #include <stdio.h>
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/ipc_logging.h"
 #include "chrome/common/plugin_messages.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/render_messages.h"
 
+#ifdef IPC_MESSAGE_LOG_ENABLED
+
 using base::Time;
 
 namespace {
 const wchar_t kTitleMsg[] = L"IPC Messages";
 
 const wchar_t kStartLoggingMsg[] = L"Start IPC Logging";
 const wchar_t kStopLoggingMsg[]  = L"Stop IPC Logging";
 const wchar_t kClearMsg[]        = L"Clear";
 const wchar_t kSettingsMsg[]     = L"Filter";
 
 enum {
   kTimeColumn = 0,
   kChannelColumn,
   kMessageColumn,
   kFlagsColumn,
   kDispatchColumn,
   kProcessColumn,
   kParamsColumn,
 };
 
+// This class ensures that we have a link dependency on render_messages.cc and
+// plugin_messages.cc, and at the same time sets up the message logger function
+// mappings.
+class RegisterLoggerFuncs {
+ public:
+  RegisterLoggerFuncs() {
+    RenderMessagesInit();
+    PluginMessagesInit();
+  }
+};
+
+RegisterLoggerFuncs g_register_logger_funcs;
+
 }  // namespace
 
 IPCStatusView* IPCStatusView::current_;
 
 IPCStatusView::IPCStatusView()
     : StatusView(TAB_CONTENTS_IPC_STATUS_VIEW) {
   DCHECK(!current_);
   current_ = this;
   settings_dialog_ = NULL;
   init_done_ = false;
   view_ = NULL;
   view_host_ = NULL;
   plugin_ = NULL;
   plugin_host_ = NULL;
   npobject_ = NULL;
   plugin_process_ = NULL;
   plugin_process_host_ = NULL;
 
-  IPC::Logging* log = IPC::Logging::current();
-  log->RegisterMessageLogger(ViewStart, ViewMsgLog);
-  log->RegisterMessageLogger(ViewHostStart, ViewHostMsgLog);
-  log->RegisterMessageLogger(PluginProcessStart, PluginProcessMsgLog);
-  log->RegisterMessageLogger(PluginProcessHostStart, PluginProcessHostMsgLog);
-  log->RegisterMessageLogger(PluginStart, PluginMsgLog);
-  log->RegisterMessageLogger(PluginHostStart, PluginHostMsgLog);
-  log->RegisterMessageLogger(NPObjectStart, NPObjectMsgLog);
-
-  log->SetConsumer(this);
+  IPC::Logging::current()->SetConsumer(this);
 }
 
 IPCStatusView::~IPCStatusView() {
   current_ = NULL;
   IPC::Logging::current()->SetConsumer(NULL);
 
   if (settings_dialog_ != NULL)
     ::DestroyWindow(settings_dialog_);
 }
 
@@ skipping 278 matching lines @@
   HINSTANCE module_handle = GetModuleHandle(chrome::kBrowserResourcesDll);
 
   settings_dialog_ = CreateDialog(module_handle,
                                   MAKEINTRESOURCE(IDD_IPC_SETTINGS),
                                   NULL,
                                   IPCStatusView::DialogProc);
   ::ShowWindow(settings_dialog_, SW_SHOW);
 }
 
 #endif // IPC_MESSAGE_LOG_ENABLED