Fix thread-checker debug code in GpuChannelHost::MessageFilter.

content/renderer/gpu/gpu_channel_host.cc

 // Copyright (c) 2011 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 "content/renderer/gpu/gpu_channel_host.h"
 
+#include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "content/common/child_process.h"
 #include "content/common/gpu/gpu_messages.h"
 #include "content/renderer/gpu/command_buffer_proxy.h"
 #include "content/renderer/gpu/transport_texture_service.h"
 #include "content/renderer/render_process.h"
 #include "content/renderer/render_thread.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_sync_message_filter.h"
 
@@ skipping 17 matching lines @@
     listener_->OnMessageReceived(msg);
 }
 
 void GpuChannelHost::Listener::DispatchError() {
   if (listener_.get())
     listener_->OnChannelError();
 }
 
 GpuChannelHost::MessageFilter::MessageFilter(GpuChannelHost* parent)
     : parent_(parent) {
-  DetachFromThread();
 }
 
 GpuChannelHost::MessageFilter::~MessageFilter() {
 
 }
 
 void GpuChannelHost::MessageFilter::AddRoute(
     int route_id,
     base::WeakPtr<IPC::Channel::Listener> listener,
     scoped_refptr<MessageLoopProxy> loop) {
-  DCHECK(CalledOnValidThread());
+  DCHECK(MessageLoop::current() == ChildProcess::current()->io_message_loop());
   DCHECK(listeners_.find(route_id) == listeners_.end());
   listeners_[route_id] = new GpuChannelHost::Listener(listener, loop);
 }
 
 void GpuChannelHost::MessageFilter::RemoveRoute(int route_id) {
-  DCHECK(CalledOnValidThread());
+  DCHECK(MessageLoop::current() == ChildProcess::current()->io_message_loop());
   ListenerMap::iterator it = listeners_.find(route_id);
   if (it != listeners_.end())
     listeners_.erase(it);
 }
 
 bool GpuChannelHost::MessageFilter::OnMessageReceived(
     const IPC::Message& message) {
-  DCHECK(CalledOnValidThread());
-
+  DCHECK(MessageLoop::current() == ChildProcess::current()->io_message_loop());
   // Never handle sync message replies or we will deadlock here.
   if (message.is_reply())
     return false;
 
   DCHECK(message.routing_id() != MSG_ROUTING_CONTROL);
 
   ListenerMap::iterator it = listeners_.find(message.routing_id());
 
   if (it != listeners_.end()) {
     const scoped_refptr<GpuChannelHost::Listener>& listener = it->second;
     listener->loop()->PostTask(
         FROM_HERE,
         NewRunnableMethod(
             listener.get(),
             &GpuChannelHost::Listener::DispatchMessage,
             message));
   }
 
   return true;
 }
 
 void GpuChannelHost::MessageFilter::OnChannelError() {
-  DCHECK(CalledOnValidThread());
-
+  DCHECK(MessageLoop::current() == ChildProcess::current()->io_message_loop());
   // Inform all the proxies that an error has occurred. This will be reported
   // via OpenGL as a lost context.
   for (ListenerMap::iterator it = listeners_.begin();
        it != listeners_.end();
        it++) {
     const scoped_refptr<GpuChannelHost::Listener>& listener = it->second;
     listener->loop()->PostTask(
         FROM_HERE,
         NewRunnableMethod(
             listener.get(),
@@ skipping 205 matching lines @@
 }
 
 void GpuChannelHost::RemoveRoute(int route_id) {
   MessageLoopProxy* io_loop = RenderProcess::current()->io_message_loop_proxy();
   io_loop->PostTask(FROM_HERE,
                     NewRunnableMethod(
                         channel_filter_.get(),
                         &GpuChannelHost::MessageFilter::RemoveRoute,
                         route_id));
 }