Callback: Replumb the type-inference.

base/callback_unittest.cc

 // Copyright (c) 2009 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/callback_internal.h"
 #include "base/scoped_ptr.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
 namespace {
 
 class HelperObject {
  public:
   HelperObject() : next_number_(0) { }
   int GetNextNumber() { return ++next_number_; }
   void GetNextNumberArg(int* number) { *number = GetNextNumber(); }
 
  private:
   int next_number_;
 };
 
-struct FakeTraits {
+struct FakeInvoker {
   static void DoInvoke(internal::InvokerStorageBase*) {
   }
 };
 
 // White-box testpoints to inject into a Callback<> object for checking
 // comparators and emptiness APIs.
 class FakeInvokerStorage1 : public internal::InvokerStorageBase {
  public:
-  typedef FakeTraits FunctionTraits;
+  typedef FakeInvoker Invoker;
 };
 
 class FakeInvokerStorage2 : public internal::InvokerStorageBase {
  public:
-  typedef FakeTraits FunctionTraits;
+  typedef FakeInvoker Invoker;
 };
 
 TEST(CallbackOld, OneArg) {
   HelperObject obj;
   scoped_ptr<Callback1<int*>::Type> callback(
       NewCallback(&obj, &HelperObject::GetNextNumberArg));
 
   int number = 0;
   callback->Run(&number);
   EXPECT_EQ(number, 1);
@@ skipping 72 matching lines @@
   ASSERT_FALSE(callback_a_.Equals(null_callback_));
 
   callback_a_.Reset();
 
   EXPECT_TRUE(callback_a_.is_null());
   EXPECT_TRUE(callback_a_.Equals(null_callback_));
 }
 
 }  // namespace
 }  // namespace base