Revert of content/common: Remove use of MessageLoopProxy and deprecated MessageLoop APIs

content/common/gpu/gpu_channel_manager.cc

 // Copyright (c) 2012 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/common/gpu/gpu_channel_manager.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
-#include "base/location.h"
-#include "base/single_thread_task_runner.h"
-#include "base/thread_task_runner_handle.h"
 #include "content/common/gpu/gpu_channel.h"
 #include "content/common/gpu/gpu_memory_buffer_factory.h"
 #include "content/common/gpu/gpu_memory_manager.h"
 #include "content/common/gpu/gpu_messages.h"
 #include "content/common/message_router.h"
 #include "gpu/command_buffer/common/value_state.h"
 #include "gpu/command_buffer/service/feature_info.h"
 #include "gpu/command_buffer/service/gpu_switches.h"
 #include "gpu/command_buffer/service/mailbox_manager_impl.h"
 #include "gpu/command_buffer/service/memory_program_cache.h"
@@ skipping 59 matching lines @@
 
 gfx::GpuMemoryBufferType GetGpuMemoryBufferFactoryType() {
   std::vector<gfx::GpuMemoryBufferType> supported_types;
   GpuMemoryBufferFactory::GetSupportedTypes(&supported_types);
   DCHECK(!supported_types.empty());
   return supported_types[0];
 }
 
 }  // namespace
 
-GpuChannelManager::GpuChannelManager(
-    MessageRouter* router,
-    GpuWatchdog* watchdog,
-    base::SingleThreadTaskRunner* io_task_runner,
-    base::WaitableEvent* shutdown_event,
-    IPC::SyncChannel* channel)
-    : io_task_runner_(io_task_runner),
+GpuChannelManager::GpuChannelManager(MessageRouter* router,
+                                     GpuWatchdog* watchdog,
+                                     base::MessageLoopProxy* io_message_loop,
+                                     base::WaitableEvent* shutdown_event,
+                                     IPC::SyncChannel* channel)
+    : io_message_loop_(io_message_loop),
       shutdown_event_(shutdown_event),
       router_(router),
       gpu_memory_manager_(
           this,
           GpuMemoryManager::kDefaultMaxSurfacesWithFrontbufferSoftLimit),
       watchdog_(watchdog),
       sync_point_manager_(gpu::SyncPointManager::Create(false)),
       gpu_memory_buffer_factory_(
           GpuMemoryBufferFactory::Create(GetGpuMemoryBufferFactoryType())),
       channel_(channel),
       filter_(
           new GpuChannelManagerMessageFilter(gpu_memory_buffer_factory_.get())),
       relinquish_resources_pending_(false),
       weak_factory_(this) {
   DCHECK(router_);
-  DCHECK(io_task_runner);
+  DCHECK(io_message_loop);
   DCHECK(shutdown_event);
   channel_->AddFilter(filter_.get());
 }
 
 GpuChannelManager::~GpuChannelManager() {
   gpu_channels_.clear();
   if (default_offscreen_surface_.get()) {
     default_offscreen_surface_->Destroy();
     default_offscreen_surface_ = NULL;
   }
@@ skipping 79 matching lines @@
     mailbox_manager = mailbox_manager_.get();
   }
 
   scoped_ptr<GpuChannel> channel(new GpuChannel(this,
                                                 watchdog_,
                                                 share_group,
                                                 mailbox_manager,
                                                 client_id,
                                                 false,
                                                 allow_future_sync_points));
-  channel->Init(io_task_runner_.get(), shutdown_event_);
+  channel->Init(io_message_loop_.get(), shutdown_event_);
   channel_handle.name = channel->GetChannelName();
 
 #if defined(OS_POSIX)
   // On POSIX, pass the renderer-side FD. Also mark it as auto-close so
   // that it gets closed after it has been sent.
   base::ScopedFD renderer_fd = channel->TakeRendererFileDescriptor();
   DCHECK(renderer_fd.is_valid());
   channel_handle.socket = base::FileDescriptor(renderer_fd.Pass());
 #endif
 
@@ skipping 28 matching lines @@
     result = iter->second->CreateViewCommandBuffer(
         window, surface_id, init_params, route_id);
   }
 
   Send(new GpuHostMsg_CommandBufferCreated(result));
 }
 
 void GpuChannelManager::DestroyGpuMemoryBuffer(
     gfx::GpuMemoryBufferId id,
     int client_id) {
-  io_task_runner_->PostTask(
-      FROM_HERE, base::Bind(&GpuChannelManager::DestroyGpuMemoryBufferOnIO,
-                            base::Unretained(this), id, client_id));
+  io_message_loop_->PostTask(
+      FROM_HERE,
+      base::Bind(&GpuChannelManager::DestroyGpuMemoryBufferOnIO,
+                 base::Unretained(this),
+                 id,
+                 client_id));
 }
 
 void GpuChannelManager::DestroyGpuMemoryBufferOnIO(
     gfx::GpuMemoryBufferId id,
     int client_id) {
   gpu_memory_buffer_factory_->DestroyGpuMemoryBuffer(id, client_id);
 }
 
 void GpuChannelManager::OnDestroyGpuMemoryBuffer(
     gfx::GpuMemoryBufferId id,
@@ skipping 43 matching lines @@
     messages_processed += iter->second->messages_processed();
   }
   return messages_processed;
 }
 
 void GpuChannelManager::LoseAllContexts() {
   for (GpuChannelMap::iterator iter = gpu_channels_.begin();
        iter != gpu_channels_.end(); ++iter) {
     iter->second->MarkAllContextsLost();
   }
-  base::ThreadTaskRunnerHandle::Get()->PostTask(
-      FROM_HERE, base::Bind(&GpuChannelManager::OnLoseAllContexts,
-                            weak_factory_.GetWeakPtr()));
+  base::MessageLoop::current()->PostTask(
+      FROM_HERE,
+      base::Bind(&GpuChannelManager::OnLoseAllContexts,
+                 weak_factory_.GetWeakPtr()));
 }
 
 void GpuChannelManager::OnLoseAllContexts() {
   gpu_channels_.clear();
   CheckRelinquishGpuResources();
 }
 
 gfx::GLSurface* GpuChannelManager::GetDefaultOffscreenSurface() {
   if (!default_offscreen_surface_.get()) {
     default_offscreen_surface_ =
@@ skipping 24 matching lines @@
     OnResourcesRelinquished();
 #endif
   }
 }
 
 void GpuChannelManager::OnResourcesRelinquished() {
   Send(new GpuHostMsg_ResourcesRelinquished());
 }
 
 }  // namespace content