Add new helper that can adapt Callbacks with return values for Closures.

base/bind_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 "base/bind.h"
 
-#if defined(BASE_CALLBACK_H_)
-// We explicitly do not want to include callback.h so people are not tempted
-// to use bind.h in a headerfile for getting the Callback types.
-#error "base/bind.h should avoid pulling in callback.h by default."
-#endif
-
 #include "base/callback.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::Mock;
 using ::testing::Return;
 using ::testing::StrictMock;
 
 namespace base {
 namespace {
@@ skipping 287 matching lines @@
   Callback<int(void)> const_method_nonconst_obj_cb =
       Bind(&HasRef::IntConstMethod0, &has_ref_);
   Callback<int(void)> const_method_const_obj_cb =
       Bind(&HasRef::IntConstMethod0, const_has_ref_ptr_);
   EXPECT_EQ(1337, normal_cb.Run());
   EXPECT_EQ(31337, method_cb.Run());
   EXPECT_EQ(41337, const_method_nonconst_obj_cb.Run());
   EXPECT_EQ(51337, const_method_const_obj_cb.Run());
 }
 
+// IgnoreReturn adapter test.
+//   - Function with return value, and no params can be converted to Closure.
+TEST_F(BindTest, IgnoreReturn) {
+  EXPECT_CALL(static_func_mock_, IntMethod0()).WillOnce(Return(1337));
+  Callback<int(void)> normal_cb = Bind(&IntFunc0);
+  Closure c = IgnoreReturn(normal_cb);
+  c.Run();
+}
+
 // Argument binding tests.
 //   - Argument binding to primitive.
 //   - Argument binding to primitive pointer.
 //   - Argument binding to a literal integer.
 //   - Argument binding to a literal string.
 //   - Argument binding with template function.
 //   - Argument binding to an object.
 //   - Argument gets type converted.
 //   - Pointer argument gets converted.
 //   - Const Reference forces conversion.
@@ skipping 271 matching lines @@
   Callback<int(void)> fastcall_cb = Bind(&FastCallFunc, 1);
   EXPECT_EQ(1, fastcall_cb.Run());
 
   Callback<int(void)> stdcall_cb = Bind(&StdCallFunc, 2);
   EXPECT_EQ(2, stdcall_cb.Run());
 }
 #endif
 
 }  // namespace
 }  // namespace base