base::Bind fixes

content/plugin/webplugin_accelerated_surface_proxy_mac.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.
 
 #import <OpenGL/OpenGL.h>
 
 #include "content/plugin/webplugin_accelerated_surface_proxy_mac.h"
 
-#include "base/callback_old.h"
+#include "base/bind.h"
 #include "content/plugin/webplugin_proxy.h"
 #include "ui/gfx/surface/accelerated_surface_mac.h"
 #include "ui/gfx/surface/transport_dib.h"
 
 WebPluginAcceleratedSurfaceProxy::WebPluginAcceleratedSurfaceProxy(
     WebPluginProxy* plugin_proxy,
     gfx::GpuPreference gpu_preference)
         : plugin_proxy_(plugin_proxy),
           window_handle_(NULL) {
   surface_ = new AcceleratedSurface;
   // It's possible for OpenGL to fail to initialze (e.g., if an incompatible
   // mode is forced via flags), so handle that gracefully.
   if (!surface_->Initialize(NULL, true, gpu_preference)) {
     delete surface_;
     surface_ = NULL;
     return;
   }
 
   // Only used for 10.5 support, but harmless on 10.6+.
   surface_->SetTransportDIBAllocAndFree(
-      NewCallback(plugin_proxy_, &WebPluginProxy::AllocSurfaceDIB),
-      NewCallback(plugin_proxy_, &WebPluginProxy::FreeSurfaceDIB));
+      base::Bind(&WebPluginProxy::AllocSurfaceDIB,
+          base::Unretained(plugin_proxy)),
+      base::Bind(&WebPluginProxy::FreeSurfaceDIB,
+          base::Unretained(plugin_proxy)));
 }
 
 WebPluginAcceleratedSurfaceProxy::~WebPluginAcceleratedSurfaceProxy() {
   if (surface_) {
     surface_->Destroy();
     delete surface_;
     surface_ = NULL;
   }
 }
 
@@ skipping 30 matching lines @@
 }
 
 void WebPluginAcceleratedSurfaceProxy::EndDrawing() {
   if (!surface_)
     return;
 
   surface_->SwapBuffers();
   plugin_proxy_->AcceleratedFrameBuffersDidSwap(
       window_handle_, surface_->GetSurfaceId());
 }