base::Bind fixes

ui/gfx/surface/accelerated_surface_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.
 
 #include "ui/gfx/surface/accelerated_surface_mac.h"
 
 #include "base/logging.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "ui/gfx/gl/gl_bindings.h"
 #include "ui/gfx/gl/gl_context.h"
@@ skipping 53 matching lines @@
   return true;
 }
 
 void AcceleratedSurface::Destroy() {
   // The FBO and texture objects will be destroyed when the OpenGL context,
   // and any other contexts sharing resources with it, is. We don't want to
   // make the context current one last time here just in order to delete
   // these objects.
 
   // Release the old TransportDIB in the browser.
-  if (dib_free_callback_.get() && transport_dib_.get()) {
-    dib_free_callback_->Run(transport_dib_->id());
+  if (!dib_free_callback_.is_null() && transport_dib_.get()) {
+    dib_free_callback_.Run(transport_dib_->id());
   }
   transport_dib_.reset();
 
   gl_context_ = NULL;
   gl_surface_ = NULL;
 }
 
 // Call after making changes to the surface which require a visual update.
 // Makes the rendering show up in other processes.
 void AcceleratedSurface::SwapBuffers() {
@@ skipping 238 matching lines @@
   if (surface_size_ == size) {
     // Return an invalid handle to indicate to the caller that no new backing
     // store allocation occurred.
     return TransportDIB::DefaultHandleValue();
   }
   surface_size_ = size;
   gfx::Size clamped_size = ClampToValidDimensions(size);
   real_surface_size_ = clamped_size;
 
   // Release the old TransportDIB in the browser.
-  if (dib_free_callback_.get() && transport_dib_.get()) {
-    dib_free_callback_->Run(transport_dib_->id());
+  if (!dib_free_callback_.is_null() && transport_dib_.get()) {
+    dib_free_callback_.Run(transport_dib_->id());
   }
   transport_dib_.reset();
 
   // Ask the renderer to create a TransportDIB.
   size_t dib_size =
       clamped_size.width() * 4 * clamped_size.height();  // 4 bytes per pixel.
   TransportDIB::Handle dib_handle;
-  if (dib_alloc_callback_.get()) {
-    dib_alloc_callback_->Run(dib_size, &dib_handle);
+  if (!dib_alloc_callback_.is_null()) {
+    dib_alloc_callback_.Run(dib_size, &dib_handle);
   }
   if (!TransportDIB::is_valid_handle(dib_handle)) {
     // If the allocator fails, it means the DIB was not created in the browser,
     // so there is no need to run the deallocator here.
     return TransportDIB::DefaultHandleValue();
   }
   transport_dib_.reset(TransportDIB::Map(dib_handle));
   if (transport_dib_.get() == NULL) {
     // TODO(dspringer): if the Map() fails, should the deallocator be run so
     // that the DIB is deallocated in the browser?
@@ skipping 14 matching lines @@
                  0,  // 0 border
                  GL_BGRA,  // Used for consistency
                  GL_UNSIGNED_INT_8_8_8_8_REV,
                  NULL);  // No data, just reserve room on the card.
     SetupFrameBufferObject(target);
   }
   return transport_dib_->handle();
 }
 
 void AcceleratedSurface::SetTransportDIBAllocAndFree(
-    Callback2<size_t, TransportDIB::Handle*>::Type* allocator,
-    Callback1<TransportDIB::Id>::Type* deallocator) {
-  dib_alloc_callback_.reset(allocator);
-  dib_free_callback_.reset(deallocator);
+    const base::Callback<void(size_t, TransportDIB::Handle*)>& allocator,
+    const base::Callback<void(TransportDIB::Id)>& deallocator) {
+  dib_alloc_callback_ = allocator;
+  dib_free_callback_ = deallocator;
 }