Move code in src/remoting to the new callbacks.

remoting/host/capturer_mac_unittest.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 "remoting/host/capturer.h"
 
 #include <ApplicationServices/ApplicationServices.h>
 
 #include <ostream>
 
+#include "base/bind.h"
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace remoting {
 
 class CapturerMacTest : public testing::Test {
  protected:
   virtual void SetUp() {
     capturer_.reset(Capturer::Create());
@@ skipping 60 matching lines @@
   EXPECT_EQ(static_cast<int>(sizeof(uint32_t) * width),
             abs(planes.strides[0]));
   EXPECT_EQ(0, planes.strides[1]);
   EXPECT_EQ(0, planes.strides[2]);
 }
 
 TEST_F(CapturerMacTest, Capture) {
   SCOPED_TRACE("");
   // Check that we get an initial full-screen updated.
   CapturerCallback1 callback1;
-  capturer_->CaptureInvalidRegion(
-      NewCallback(&callback1, &CapturerCallback1::CaptureDoneCallback));
+  capturer_->CaptureInvalidRegion(base::Bind(
+      &CapturerCallback1::CaptureDoneCallback, base::Unretained(&callback1)));
   // Check that subsequent dirty rects are propagated correctly.
   AddDirtyRect();
   CapturerCallback2 callback2(region_);
   capturer_->InvalidateRegion(region_);
-  capturer_->CaptureInvalidRegion(
-      NewCallback(&callback2, &CapturerCallback2::CaptureDoneCallback));
+  capturer_->CaptureInvalidRegion(base::Bind(
+      &CapturerCallback2::CaptureDoneCallback, base::Unretained(&callback2)));
 }
 
 }  // namespace remoting
 
 namespace gfx {
 
 std::ostream& operator<<(std::ostream& out, const SkRegion& region) {
   out << "SkRegion(";
   for (SkRegion::Iterator i(region); !i.done(); i.next()) {
     const SkIRect& r = i.rect();
     out << "(" << r.fLeft << ","  << r.fTop << ","
         << r.fRight  << ","  << r.fBottom << ")";
   }
   out << ")";
   return out;
 }
 
 }  // namespace gfx