Move CallbackBase::polymorphic_invoke_ into BindStateBase

base/callback_unittest.cc

 // Copyright (c) 2012 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 <memory>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/callback_internal.h"
 #include "base/memory/ref_counted.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
 
-void NopInvokeFunc(internal::BindStateBase*) {}
+void NopInvokeFunc() {}
 
 // White-box testpoints to inject into a Callback<> object for checking
 // comparators and emptiness APIs.  Use a BindState that is specialized
 // based on a type we declared in the anonymous namespace above to remove any
 // chance of colliding with another instantiation and breaking the
 // one-definition-rule.
 struct FakeBindState1 : internal::BindStateBase {
-  FakeBindState1() : BindStateBase(&Destroy) {}
+  FakeBindState1() : BindStateBase(&NopInvokeFunc, &Destroy) {}
  private:
   ~FakeBindState1() {}
   static void Destroy(internal::BindStateBase* self) {
     delete static_cast<FakeBindState1*>(self);
   }
 };
 
 struct FakeBindState2 : internal::BindStateBase {
-  FakeBindState2() : BindStateBase(&Destroy) {}
+  FakeBindState2() : BindStateBase(&NopInvokeFunc, &Destroy) {}
  private:
   ~FakeBindState2() {}
   static void Destroy(internal::BindStateBase* self) {
     delete static_cast<FakeBindState2*>(self);
   }
 };
 
 namespace {
 
 class CallbackTest : public ::testing::Test {
  public:
   CallbackTest()
-      : callback_a_(new FakeBindState1(), &NopInvokeFunc),
-        callback_b_(new FakeBindState2(), &NopInvokeFunc) {
+      : callback_a_(new FakeBindState1()),
+        callback_b_(new FakeBindState2()) {
   }
 
   ~CallbackTest() override {}
 
  protected:
   Callback<void()> callback_a_;
   const Callback<void()> callback_b_;  // Ensure APIs work with const.
   Callback<void()> null_callback_;
 };
 
@@ skipping 22 matching lines @@
   EXPECT_FALSE(callback_a_.is_null());
   EXPECT_FALSE(callback_b_.is_null());
 }
 
 TEST_F(CallbackTest, Equals) {
   EXPECT_TRUE(callback_a_.Equals(callback_a_));
   EXPECT_FALSE(callback_a_.Equals(callback_b_));
   EXPECT_FALSE(callback_b_.Equals(callback_a_));
 
   // We should compare based on instance, not type.
-  Callback<void()> callback_c(new FakeBindState1(), &NopInvokeFunc);
+  Callback<void()> callback_c(new FakeBindState1());
   Callback<void()> callback_a2 = callback_a_;
   EXPECT_TRUE(callback_a_.Equals(callback_a2));
   EXPECT_FALSE(callback_a_.Equals(callback_c));
 
   // Empty, however, is always equal to empty.
   Callback<void()> empty2;
   EXPECT_TRUE(null_callback_.Equals(empty2));
 }
 
 TEST_F(CallbackTest, Reset) {
@@ skipping 55 matching lines @@
 
 TEST_F(CallbackTest, CallbackHasLastRefOnContainingObject) {
   bool deleted = false;
   CallbackOwner* owner = new CallbackOwner(&deleted);
   owner->Reset();
   ASSERT_TRUE(deleted);
 }
 
 }  // namespace
 }  // namespace base