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

base/callback_internal.cc

Index: base/callback_internal.cc
diff --git a/base/callback_internal.cc b/base/callback_internal.cc
index d9d1e6f9eb60426d920e034ef0b70b1d808f2f0e..582fbdc12c43b520f81e5684c3dde02072e476ea 100644
--- a/base/callback_internal.cc
+++ b/base/callback_internal.cc
@@ -8,24 +8,24 @@ namespace base {
 namespace internal {
 
 bool CallbackBase::is_null() const {
-  return invoker_storage_.get() == NULL;
+  return bind_state_.get() == NULL;
 }
 
 void CallbackBase::Reset() {
-  invoker_storage_ = NULL;
+  bind_state_ = NULL;
   polymorphic_invoke_ = NULL;
 }
 
 bool CallbackBase::Equals(const CallbackBase& other) const {
-  return invoker_storage_.get() == other.invoker_storage_.get() &&
+  return bind_state_.get() == other.bind_state_.get() &&
          polymorphic_invoke_ == other.polymorphic_invoke_;
 }
 
 CallbackBase::CallbackBase(InvokeFuncStorage polymorphic_invoke,
-                           scoped_refptr<InvokerStorageBase>* invoker_storage)
+                           scoped_refptr<BindStateBase>* bind_state)
     : polymorphic_invoke_(polymorphic_invoke) {
-  if (invoker_storage) {
-    invoker_storage_.swap(*invoker_storage);
+  if (bind_state) {
+    bind_state_.swap(*bind_state);
   }
 }