Revert my change to get the tree green. Not sure why the tests became flaky. I'll try to check them in again but in smaller chunks tomorrow.

TBR=mpcomplete

Review URL: http://codereview.chromium.org/21039

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9132 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 16 insertions, 19 deletions

diff --git a/chrome/browser/tab_contents/interstitial_page.h b/chrome/browser/tab_contents/interstitial_page.h
index 5d39546..eb18b60 100644
--- a/chrome/browser/tab_contents/interstitial_page.h
+++ b/chrome/browser/tab_contents/interstitial_page.h
@@ -7,7 +7,6 @@
 
 #include <string>
 
-#include "base/gfx/size.h"
 #include "chrome/browser/renderer_host/render_view_host_delegate.h"
 #include "chrome/common/notification_registrar.h"
 #include "googleurl/src/gurl.h"
diff --git a/chrome/browser/tab_contents/ipc_status_view.cc b/chrome/browser/tab_contents/ipc_status_view.cc
index a317aac..cd85ee0 100644
--- a/chrome/browser/tab_contents/ipc_status_view.cc
+++ b/chrome/browser/tab_contents/ipc_status_view.cc
@@ -2,13 +2,6 @@
 // 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>
@@ -24,6 +17,8 @@
 #include "chrome/common/pref_service.h"
 #include "chrome/common/render_messages.h"
 
+#ifdef IPC_MESSAGE_LOG_ENABLED
+
 using base::Time;
 
 namespace {
@@ -44,6 +39,19 @@ enum {
   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_;
@@ -62,16 +70,7 @@ IPCStatusView::IPCStatusView()
   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() {
diff --git a/chrome/browser/tab_contents/web_contents.cc b/chrome/browser/tab_contents/web_contents.cc
index f6a8666..849ba2a 100644
--- a/chrome/browser/tab_contents/web_contents.cc
+++ b/chrome/browser/tab_contents/web_contents.cc
@@ -24,7 +24,6 @@
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
-#include "chrome/common/render_messages.h"
 #include "net/base/mime_util.h"
 #include "net/base/net_errors.h"
 #include "net/base/registry_controlled_domain.h"