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

content/renderer/gpu/gpu_channel_host.h

 // 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.
 
 #ifndef CONTENT_RENDERER_GPU_GPU_CHANNEL_HOST_H_
 #define CONTENT_RENDERER_GPU_GPU_CHANNEL_HOST_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/process_util.h"
 #include "base/synchronization/lock.h"
-#include "base/threading/non_thread_safe.h"
 #include "content/common/gpu/gpu_info.h"
 #include "content/common/message_router.h"
 #include "content/renderer/gpu/gpu_video_decode_accelerator_host.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_channel_proxy.h"
 #include "ipc/ipc_sync_channel.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/size.h"
 
 class CommandBufferProxy;
@@ skipping 96 matching lines @@
 
     scoped_refptr<base::MessageLoopProxy> loop() { return loop_; }
 
    private:
     base::WeakPtr<IPC::Channel::Listener> listener_;
     scoped_refptr<base::MessageLoopProxy> loop_;
   };
 
   // A filter used internally to route incoming messages from the IO thread
   // to the correct message loop.
-  class MessageFilter : public IPC::ChannelProxy::MessageFilter,
-                        public base::NonThreadSafe {
+  class MessageFilter : public IPC::ChannelProxy::MessageFilter {
    public:
     MessageFilter(GpuChannelHost* parent);
     virtual ~MessageFilter();
 
     void AddRoute(int route_id,
                   base::WeakPtr<IPC::Channel::Listener> listener,
                   scoped_refptr<base::MessageLoopProxy> loop);
     void RemoveRoute(int route_id);
 
     // IPC::ChannelProxy::MessageFilter implementation:
@@ skipping 27 matching lines @@
   // textures. These messages are routed to TransportTextureHost.
   scoped_refptr<TransportTextureService> transport_texture_service_;
 
   // A filter for sending messages from thread other than the main thread.
   scoped_refptr<IPC::SyncMessageFilter> sync_filter_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuChannelHost);
 };
 
 #endif  // CONTENT_RENDERER_GPU_GPU_CHANNEL_HOST_H_