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

1 files changed, 4 insertions, 13 deletions

diff --git a/chrome/common/ipc_logging.h b/chrome/common/ipc_logging.h
index bf49595..567ba84 100644
--- a/chrome/common/ipc_logging.h
+++ b/chrome/common/ipc_logging.h
@@ -12,7 +12,6 @@
 #include "base/lock.h"
 #include "base/object_watcher.h"
 #include "base/singleton.h"
-#include "chrome/common/ipc_message_utils.h"
 
 class MessageLoop;
 
@@ -28,7 +27,7 @@ class Logging : public base::ObjectWatcher::Delegate {
   // Implemented by consumers of log messages.
   class Consumer {
    public:
-    virtual void Log(const LogData& data) = 0;
+    virtual void Log(const IPC::LogData& data) = 0;
   };
 
   void SetConsumer(Consumer* consumer);
@@ -42,7 +41,7 @@ class Logging : public base::ObjectWatcher::Delegate {
 
   // Called by child processes to give the logger object the channel to send
   // logging data to the browser process.
-  void SetIPCSender(Message::Sender* sender);
+  void SetIPCSender(IPC::Message::Sender* sender);
 
   // Called in the browser process when logging data from a child process is
   // received.
@@ -67,14 +66,8 @@ class Logging : public base::ObjectWatcher::Delegate {
   // ObjectWatcher::Delegate implementation
   void OnObjectSignaled(HANDLE object);
 
-  typedef void (LogFunction)(uint16 type,
-                             std::wstring* name,
-                             const Message* msg,
-                             std::wstring* params);
-  void RegisterMessageLogger(int msg_start, LogFunction* func); 
-
  private:
-  friend struct DefaultSingletonTraits<Logging>;
+  friend struct DefaultSingletonTraits<IPC::Logging>;
   Logging();
 
   std::wstring GetEventName(int browser_pid, bool enabled);
@@ -92,12 +85,10 @@ class Logging : public base::ObjectWatcher::Delegate {
   std::vector<LogData> queued_logs_;
   bool queue_invoke_later_pending_;
 
-  Message::Sender* sender_;
+  IPC::Message::Sender* sender_;
   MessageLoop* main_thread_;
 
   Consumer* consumer_;
-
-  LogFunction* log_function_mapping_[LastMsgIndex];
 };
 
 }  // namespace IPC