Revert 114494 - Remove BindStateHolder and have Bind() return a Callback<> object directly.

base/bind_unittest.cc

Index: base/bind_unittest.cc
===================================================================
--- base/bind_unittest.cc	(revision 114494)
+++ base/bind_unittest.cc	(working copy)
@@ -199,18 +199,10 @@
   n = 2;
 }
 
-void PtrArgSet(int *n) {
-  *n = 2;
-}
-
 int FunctionWithWeakFirstParam(WeakPtr<NoRef> o, int n) {
   return n;
 }
 
-void TakesACallback(const Closure& callback) {
-  callback.Run();
-}
-
 class BindTest : public ::testing::Test {
  public:
   BindTest() {
@@ -292,25 +284,6 @@
   EXPECT_EQ(63, c0.Run());
 }
 
-// Test that currying the rvalue result of another Bind() works correctly.
-//   - rvalue should be usable as argument to Bind().
-//   - multiple runs of resulting Callback remain valid.
-TEST_F(BindTest, CurryingRvalueResultOfBind) {
-  int n = 0;
-  Closure cb = base::Bind(&TakesACallback, base::Bind(&PtrArgSet, &n));
-
-  // If we implement Bind() such that the return value has auto_ptr-like
-  // semantics, the second call here will fail because ownership of
-  // the internal BindState<> would have been transfered to a *temporary*
-  // constructon of a Callback object on the first call.
-  cb.Run();
-  EXPECT_EQ(2, n);
-
-  n = 0;
-  cb.Run();
-  EXPECT_EQ(2, n);
-}
-
 // Function type support.
 //   - Normal function.
 //   - Normal function bound with non-refcounted first argument.