Callback API Change: Reimplement Bind(); support IgnoreResult, full currying, and use less types

base/bind_unittest.nc

 // 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/callback.h"
 #include "base/bind.h"
+#include "base/memory/ref_counted.h"
 
 namespace base {
 
 // Do not put everything inside an anonymous namespace.  If you do, many of the
 // helper function declarations will generate unused definition warnings unless
 // unused definition warnings.
 
 static const int kParentValue = 1;
 static const int kChildValue = 2;
 
 class NoRef {
  public:
   void VoidMethod0() {}
   void VoidConstMethod0() const {}
   int IntMethod0() { return 1; }
 };
 
-class HasRef : public NoRef {
- public:
-  void AddRef(void) const {}
-  bool Release(void) const { return true; }
+class HasRef : public NoRef, public base::RefCounted<HasRef> {
 };
 
 class Parent {
  public:
   void AddRef(void) const {}
   void Release(void) const {}
   virtual void VirtualSet() { value = kParentValue; }
   void NonVirtualSet() { value = kParentValue; }
   int value;
 };
@@ skipping 130 matching lines @@
   Callback<void(void)> method_bound_to_array_cb =
       Bind(&HasRef::VoidMethod0, p);
   method_bound_to_array_cb.Run();
 }
 
 #elif defined(NCTEST_NO_RAW_PTR_FOR_REFCOUNTED_TYPES)  // [r"creating array with negative size"]
 
 // Refcounted types should not be bound as a raw pointer.
 void WontCompile() {
   HasRef for_raw_ptr;
+  int a;
+  Callback<void(void)> ref_count_as_raw_ptr_a =
+      Bind(&VoidPolymorphic1<int*>, &a);
   Callback<void(void)> ref_count_as_raw_ptr =
       Bind(&VoidPolymorphic1<HasRef*>, &for_raw_ptr);
 }
 
 #elif defined(NCTEST_WEAKPTR_BIND_MUST_RETURN_VOID)  // [r"creating array with negative size"]
 
 // WeakPtrs cannot be bound to methods with return types.
 void WontCompile() {
   NoRef no_ref;
   WeakPtrFactory<NoRef> weak_factory(&no_ref);
   Callback<int(void)> weak_ptr_with_non_void_return_type =
       Bind(&NoRef::IntMethod0, weak_factory.GetWeakPtr());
   weak_ptr_with_non_void_return_type.Run();
 }
 
-#elif defined(NCTEST_DISALLOW_ASSIGN_DIFFERINT_TYPES)  // [r"creating array with negative size"]
+#elif defined(NCTEST_DISALLOW_ASSIGN_DIFFERINT_TYPES)  // [r"invalid conversion from"]
 
 // Bind result cannot be assigned to Callbacks with a mismatching type.
 void WontCompile() {
   Closure callback_mismatches_bind_type = Bind(&VoidPolymorphic1<int>);
 }
 
 #endif
 
 }  // namespace base