Callback: Replumb the type-inference.

base/callback_unittest.cc

Index: base/callback_unittest.cc
diff --git a/base/callback_unittest.cc b/base/callback_unittest.cc
index e41b39988a91fb5eb1e300f1dde2059e436d000e..f327412c2e2f399c8147dbb48cdae8f28edf43c7 100644
--- a/base/callback_unittest.cc
+++ b/base/callback_unittest.cc
@@ -21,7 +21,7 @@ class HelperObject {
   int next_number_;
 };
 
-struct FakeTraits {
+struct FakeInvoker {
   static void DoInvoke(internal::InvokerStorageBase*) {
   }
 };
@@ -30,12 +30,12 @@ struct FakeTraits {
 // 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) {