base::Bind fixes

net/dns/watching_file_reader_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 "net/dns/watching_file_reader.h"
 
+#include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/synchronization/lock.h"
 #include "base/synchronization/waitable_event.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 
 namespace {
 
 class WatchingFileReaderTest : public testing::Test {
@@ skipping 81 matching lines @@
     BreakNow("OnWatch");
     return !fail_on_watch_;
   }
 
   void OnWork() {
     EXPECT_TRUE(message_loop_ == MessageLoop::current());
     BreakNow("OnWork");
   }
 
  protected:
-  friend class BreakTask;
-  class BreakTask : public Task {
-   public:
-    BreakTask(WatchingFileReaderTest* test, std::string breakpoint)
-      : test_(test), breakpoint_(breakpoint) {}
-    virtual ~BreakTask() {}
-    virtual void Run() OVERRIDE {
-      test_->breakpoint_ = breakpoint_;
-      MessageLoop::current()->QuitNow();
-    }
-   private:
-    WatchingFileReaderTest* test_;
-    std::string breakpoint_;
-  };
+  void BreakCallback(std::string breakpoint) {
+    breakpoint_ = breakpoint;
+    MessageLoop::current()->QuitNow();
+  }
 
   void BreakNow(std::string b) {
-    message_loop_->PostTask(FROM_HERE, new BreakTask(this, b));
+    message_loop_->PostTask(FROM_HERE,
+        base::Bind(&WatchingFileReaderTest::BreakCallback,
+                   base::Unretained(this), b));
   }
 
   void RunUntilBreak(std::string b) {
     message_loop_->Run();
     ASSERT_EQ(breakpoint_, b);
   }
 
   WatchingFileReaderTest()
       : watcher_shim_(NULL),
         fail_on_watch_(false),
@@ skipping 31 matching lines @@
   watcher_shim_->PathChanged();
   RunUntilBreak("OnWork");
 
   message_loop_->AssertIdle();
 }
 
 }  // namespace
 
 }  // namespace net