Make IPC::Logging register to watch for message loop destruction.

chrome/common/ipc_logging.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/common/ipc_logging.h"
 
 #if defined(OS_POSIX)
 #ifdef IPC_MESSAGE_LOG_ENABLED
 // This will cause render_messages.h etc to define ViewMsgLog and friends.
 #define IPC_MESSAGE_MACROS_LOG_ENABLED
@@ skipping 78 matching lines @@
   event_name = GetEventName(browser_pid, false);
   logging_event_off_.reset(new base::WaitableEvent(
       CreateEvent(NULL, TRUE, FALSE, event_name.c_str())));
 
   RegisterWaitForEvent(true);
 #elif defined(OS_POSIX)
   if (getenv("CHROME_IPC_LOGGING"))
     enabled_ = true;
   SetLoggerFunctions(g_log_function_mapping);
 #endif
+
+  MessageLoop::current()->AddDestructionObserver(this);
 }
 
 Logging::~Logging() {
-  watcher_.StopWatching();
 }
 
 Logging* Logging::current() {
   return Singleton<Logging>::get();
 }
 
 void Logging::RegisterWaitForEvent(bool enabled) {
   watcher_.StopWatching();
   watcher_.StartWatching(
       enabled ? logging_event_on_.get() : logging_event_off_.get(), this);
 }
 
 void Logging::OnWaitableEventSignaled(base::WaitableEvent* event) {
   enabled_ = event == logging_event_on_.get();
   RegisterWaitForEvent(!enabled_);
 }
 
+void Logging::WillDestroyCurrentMessageLoop() {
+  watcher_.StopWatching();
+}
+
 void Logging::SetLoggerFunctions(LogFunction *functions) {
   log_function_mapping_ = functions;
 }
 
 #if defined(OS_WIN)
 std::wstring Logging::GetEventName(bool enabled) {
   return current()->GetEventName(GetCurrentProcessId(), enabled);
 }
 #endif
 
@@ skipping 169 matching lines @@
     data->receive = message.received_time();
     data->dispatch = Time::Now().ToInternalValue();
     data->params = params;
     data->message_name = message_name;
   }
 }
 
 }
 
 #endif  // IPC_MESSAGE_LOG_ENABLED