Update base::is_member_function_pointer to use variadic templates.

BUG=

Review URL: https://codereview.chromium.org/598223003

Cr-Commit-Position: refs/heads/master@{#296817}


CrOS-Libchrome-Original-Commit: 489d67130b22457a2c9ee7b6671cc105bf5204c3
diff --git a/base/template_util_unittest.cc b/base/template_util_unittest.cc
index 98ad938..3ec3887 100644
--- a/base/template_util_unittest.cc
+++ b/base/template_util_unittest.cc
@@ -87,6 +87,8 @@
                IsMemberFunctionPointer);
 COMPILE_ASSERT(!is_member_function_pointer<AStruct*>::value,
                IsMemberFunctionPointer);
+COMPILE_ASSERT(!is_member_function_pointer<void(*)()>::value,
+               IsMemberFunctionPointer);
 COMPILE_ASSERT(!is_member_function_pointer<int(*)(int)>::value,
                IsMemberFunctionPointer);
 COMPILE_ASSERT(!is_member_function_pointer<int(*)(int, int)>::value,
@@ -102,29 +104,6 @@
                IsMemberFunctionPointer);
 COMPILE_ASSERT(is_member_function_pointer<int (AStruct::*)(int, int)>::value,
                IsMemberFunctionPointer);
-COMPILE_ASSERT(is_member_function_pointer<
-                 int (AStruct::*)(int, int) const>::value,
-               IsMemberFunctionPointer);
-COMPILE_ASSERT(is_member_function_pointer<
-                 int (AStruct::*)(int, int, int)>::value,
-               IsMemberFunctionPointer);
-COMPILE_ASSERT(is_member_function_pointer<
-                 int (AStruct::*)(int, int, int) const>::value,
-               IsMemberFunctionPointer);
-COMPILE_ASSERT(is_member_function_pointer<
-                 int (AStruct::*)(int, int, int, int)>::value,
-               IsMemberFunctionPointer);
-COMPILE_ASSERT(is_member_function_pointer<
-                 int (AStruct::*)(int, int, int, int) const>::value,
-               IsMemberFunctionPointer);
-
-// False because we don't have a specialization for 5 params yet.
-COMPILE_ASSERT(!is_member_function_pointer<
-                 int (AStruct::*)(int, int, int, int, int)>::value,
-               IsMemberFunctionPointer);
-COMPILE_ASSERT(!is_member_function_pointer<
-                 int (AStruct::*)(int, int, int, int, int) const>::value,
-               IsMemberFunctionPointer);
 
 }  // namespace
 }  // namespace base