base::Bind: Remove callback_old.h.

content/renderer/gpu/transport_texture_host.h

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
 // Transport texture is a mechanism to share a texture between renderer process
 // and GPU process. This is useful when a texture is used in the renderer
 // process but updated in the GPU process.
 //
 // BACKGROUND INFORMATION
 //
 // Renderer process uses command buffer to submit GLES2 commands to the GPU
@@ skipping 73 matching lines @@
 //   factory->CreateTextures(3, 1024, 768, TransportTexture::RGB, &textures,
 //                           base::Bind(&TextureCreateDone), textures);
 // }
 
 #ifndef CONTENT_RENDERER_GPU_TRANSPORT_TEXTURE_HOST_H_
 #define CONTENT_RENDERER_GPU_TRANSPORT_TEXTURE_HOST_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/callback_old.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/task.h"
 #include "ipc/ipc_channel.h"
 
 class MessageLoop;
 class RendererGLContext;
 class TransportTextureService;
 
 class TransportTextureHost
     : public base::RefCountedThreadSafe<TransportTextureHost>,
       public IPC::Channel::Listener {
  public:
-  typedef Callback1<int>::Type TextureUpdateCallback;
+  typedef base::Callback<void(int)> TextureUpdateCallback;
 
   // |io_message_loop| is where the IPC communication should happen.
-  // |render_message_loop| is where the GLES2 commands should be exeucted.
+  // |render_message_loop| is where the GLES2 commands should be executed.
   // |service| contains the route to this object.
   // |sender| is used to send IPC messages to GPU process.
   // |context| is the RendererGLContextt for generating textures.
   // |context_route_id| is the route ID for the GpuChannelHost.
   // |host_id| is the ID of this object in GpuChannelHost.
   TransportTextureHost(MessageLoop* io_message_loop,
                        MessageLoop* render_message_loop,
                        TransportTextureService* service,
                        IPC::Message::Sender* sender,
                        RendererGLContext* context,
@@ skipping 13 matching lines @@
   // Call this method only after textures are not used in both the renderer
   // and GPU process.
   void Destroy();
 
   // Get the list of textures generated through this factory.
   // A callback must be provided to listen to texture update events. The
   // callback will be called on the IO thread.
   //
   // Note that this method doesn't generate any textures, it simply return
   // the list of textures generated.
-  void GetTextures(TextureUpdateCallback* callback,
+  void GetTextures(const TextureUpdateCallback& callback,
                    std::vector<int>* textures);
 
   // Return the peer ID of TransportTexture in the GPU process.
   int GetPeerId();
 
   // IPC::Channel::Listener.
   virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
   virtual void OnChannelError() OVERRIDE;
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
@@ skipping 24 matching lines @@
   int32 context_route_id_;
   int32 host_id_;
   int32 peer_id_;
 
   scoped_ptr<Task> init_task_;
 
   // A list of textures generated.
   std::vector<int> textures_;
 
   // Callback when a texture is updated.
-  scoped_ptr<TextureUpdateCallback> update_callback_;
+  TextureUpdateCallback update_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(TransportTextureHost);
 };
 
 #endif  // CONTENT_RENDERER_GPU_TRANSPORT_TEXTURE_HOST_H_