Clean up base::Callback stuff

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/bind.h"
 #include "base/callback.h"
 #include "base/callback_helpers.h"
 #include "base/callback_internal.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
 
 namespace {
 
 struct FakeInvoker {
   typedef void(RunType)(internal::BindStateBase*);
   static void Run(internal::BindStateBase*) {
   }
 };
 
 }  // namespace
 
 namespace internal {
-template <typename Runnable, typename RunType, typename BoundArgsType>
-struct BindState;
 
 // 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.
 template <>
-struct BindState<void(void), void(void), void(FakeInvoker)>
+struct BindState<void(void), void(void), FakeInvoker>
     : public BindStateBase {
  public:
   BindState() : BindStateBase(&Destroy) {}
   typedef FakeInvoker InvokerType;
  private:
   ~BindState() {}
   static void Destroy(BindStateBase* self) {
     delete static_cast<BindState*>(self);
   }
 };
 
 template <>
-struct BindState<void(void), void(void),
-                           void(FakeInvoker, FakeInvoker)>
+struct BindState<void(void), void(void), FakeInvoker, FakeInvoker>
     : public BindStateBase {
  public:
   BindState() : BindStateBase(&Destroy) {}
   typedef FakeInvoker InvokerType;
  private:
   ~BindState() {}
   static void Destroy(BindStateBase* self) {
     delete static_cast<BindState*>(self);
   }
 };
 }  // namespace internal
 
 namespace {
 
-typedef internal::BindState<void(void), void(void), void(FakeInvoker)>
+typedef internal::BindState<void(void), void(void), FakeInvoker>
     FakeBindState1;
-typedef internal::BindState<void(void), void(void),
-                            void(FakeInvoker, FakeInvoker)>
-   FakeBindState2;
+typedef internal::BindState<void(void), void(void), FakeInvoker, FakeInvoker>
+    FakeBindState2;
 
 class CallbackTest : public ::testing::Test {
  public:
   CallbackTest()
       : callback_a_(new FakeBindState1()),
         callback_b_(new FakeBindState2()) {
   }
 
   ~CallbackTest() override {}
 
@@ skipping 104 matching lines @@
 
 TEST_F(CallbackTest, CallbackHasLastRefOnContainingObject) {
   bool deleted = false;
   CallbackOwner* owner = new CallbackOwner(&deleted);
   owner->Reset();
   ASSERT_TRUE(deleted);
 }
 
 }  // namespace
 }  // namespace base