Remove custom Task implementations and re-exorcise old callbacks from gpu.

content/browser/gpu/gpu_process_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_BROWSER_GPU_GPU_PROCESS_HOST_H_
 #define CONTENT_BROWSER_GPU_GPU_PROCESS_HOST_H_
 #pragma once
 
 #include <map>
 #include <queue>
 
-#include "base/callback_old.h"
+#include "base/callback.h"
 #include "base/memory/linked_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "content/browser/browser_child_process_host.h"
 #include "content/common/content_export.h"
 #include "content/common/gpu/gpu_process_launch_causes.h"
 #include "content/public/common/gpu_info.h"
 #include "ui/gfx/native_widget_types.h"
 
 struct GPUCreateCommandBufferConfig;
 
@@ skipping 28 matching lines @@
   // null if the process no longer exists.
   static GpuProcessHost* FromID(int host_id);
   int host_id() const { return host_id_; }
 
   virtual bool Send(IPC::Message* msg) OVERRIDE;
 
   // ChildProcessHost implementation.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
 
-  typedef Callback3<const IPC::ChannelHandle&,
-                    base::ProcessHandle,
-                    const content::GPUInfo&>::Type
-    EstablishChannelCallback;
+  typedef base::Callback<void(const IPC::ChannelHandle&,
+                              base::ProcessHandle,
+                              const content::GPUInfo&)>
+      EstablishChannelCallback;
 
   // Tells the GPU process to create a new channel for communication with a
   // renderer. Once the GPU process responds asynchronously with the IPC handle
   // and GPUInfo, we call the callback.
   void EstablishGpuChannel(
-      int renderer_id, EstablishChannelCallback* callback);
+      int renderer_id, const EstablishChannelCallback& callback);
 
-  typedef Callback1<int32>::Type CreateCommandBufferCallback;
+  typedef base::Callback<void(int32)> CreateCommandBufferCallback;
 
   // Tells the GPU process to create a new command buffer that draws into the
   // window associated with the given renderer.
   void CreateViewCommandBuffer(
       gfx::PluginWindowHandle compositing_surface,
       int32 render_view_id,
       int32 renderer_id,
       const GPUCreateCommandBufferConfig& init_params,
-      CreateCommandBufferCallback* callback);
+      const CreateCommandBufferCallback& callback);
 
   // Whether this GPU process is set up to use software rendering.
   bool software_rendering();
 
   void ForceShutdown();
 
  private:
   GpuProcessHost(int host_id);
   virtual ~GpuProcessHost();
 
   bool Init();
 
   // Post an IPC message to the UI shim's message handler on the UI thread.
   void RouteOnUIThread(const IPC::Message& message);
 
   virtual void OnProcessLaunched() OVERRIDE;
   virtual void OnProcessCrashed(int exit_code) OVERRIDE;
 
   // Message handlers.
   void OnChannelEstablished(const IPC::ChannelHandle& channel_handle);
   void OnCommandBufferCreated(const int32 route_id);
   void OnDestroyCommandBuffer(
       gfx::PluginWindowHandle window, int32 renderer_id, int32 render_view_id);
   void OnGraphicsInfoCollected(const content::GPUInfo& gpu_info);
 
   bool LaunchGpuProcess(const std::string& channel_id);
 
   void SendOutstandingReplies();
   void EstablishChannelError(
-      EstablishChannelCallback* callback,
+      const EstablishChannelCallback& callback,
       const IPC::ChannelHandle& channel_handle,
       base::ProcessHandle renderer_process_for_gpu,
       const content::GPUInfo& gpu_info);
-  void CreateCommandBufferError(CreateCommandBufferCallback* callback,
+  void CreateCommandBufferError(const CreateCommandBufferCallback& callback,
                                 int32 route_id);
 
   // The serial number of the GpuProcessHost / GpuProcessHostUIShim pair.
   int host_id_;
 
   // These are the channel requests that we have already sent to
   // the GPU process, but haven't heard back about yet.
-  std::queue<linked_ptr<EstablishChannelCallback> > channel_requests_;
+  std::queue<EstablishChannelCallback> channel_requests_;
 
   // The pending create command buffer requests we need to reply to.
-  std::queue<linked_ptr<CreateCommandBufferCallback> >
-      create_command_buffer_requests_;
+  std::queue<CreateCommandBufferCallback> create_command_buffer_requests_;
 
 #if defined(TOOLKIT_USES_GTK)
   typedef std::pair<int32 /* renderer_id */,
                     int32 /* render_view_id */> ViewID;
 
   // Encapsulates surfaces that we lock when creating view command buffers.
   // We release this lock once the command buffer (or associated GPU process)
   // is destroyed. This prevents the browser from destroying the surface
   // while the GPU process is drawing to it.
 
@@ skipping 20 matching lines @@
 
   // Master switch for enabling/disabling GPU acceleration for the current
   // browser session. It does not change the acceleration settings for
   // existing tabs, just the future ones.
   CONTENT_EXPORT static bool gpu_enabled_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuProcessHost);
 };
 
 #endif  // CONTENT_BROWSER_GPU_GPU_PROCESS_HOST_H_