Add a void* parameter to the AtExitManager callbacks.

base/at_exit_unittest.cc

 // Copyright (c) 2006-2008 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/at_exit.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 // Don't test the global AtExitManager, because asking it to process its
 // AtExit callbacks can ruin the global state that other tests may depend on.
 class ShadowingAtExitManager : public base::AtExitManager {
  public:
   ShadowingAtExitManager() : AtExitManager(true) {}
 };
 
 int g_test_counter_1 = 0;
 int g_test_counter_2 = 0;
 
-void IncrementTestCounter1() {
+void IncrementTestCounter1(void* unused) {
   ++g_test_counter_1;
 }
 
-void IncrementTestCounter2() {
+void IncrementTestCounter2(void* unused) {
   ++g_test_counter_2;
 }
 
 void ZeroTestCounters() {
   g_test_counter_1 = 0;
   g_test_counter_2 = 0;
 }
 
-void ExpectCounter1IsZero() {
+void ExpectCounter1IsZero(void* unused) {
   EXPECT_EQ(0, g_test_counter_1);
 }
 
+void ExpectParamIsNull(void* param) {
+  EXPECT_EQ(static_cast<void*>(NULL), param);
+}
+
+void ExpectParamIsCounter(void* param) {
+  EXPECT_EQ(&g_test_counter_1, param);
+}
+
 }  // namespace
 
 TEST(AtExitTest, Basic) {
   ShadowingAtExitManager shadowing_at_exit_manager;
 
   ZeroTestCounters();
-  base::AtExitManager::RegisterCallback(&IncrementTestCounter1);
-  base::AtExitManager::RegisterCallback(&IncrementTestCounter2);
-  base::AtExitManager::RegisterCallback(&IncrementTestCounter1);
+  base::AtExitManager::RegisterCallback(&IncrementTestCounter1, NULL);
+  base::AtExitManager::RegisterCallback(&IncrementTestCounter2, NULL);
+  base::AtExitManager::RegisterCallback(&IncrementTestCounter1, NULL);
   
   EXPECT_EQ(0, g_test_counter_1);
   EXPECT_EQ(0, g_test_counter_2);
   base::AtExitManager::ProcessCallbacksNow();
   EXPECT_EQ(2, g_test_counter_1);
   EXPECT_EQ(1, g_test_counter_2);
 }
 
 TEST(AtExitTest, LIFOOrder) {
   ShadowingAtExitManager shadowing_at_exit_manager;
 
   ZeroTestCounters();
-  base::AtExitManager::RegisterCallback(&IncrementTestCounter1);
-  base::AtExitManager::RegisterCallback(&ExpectCounter1IsZero);
-  base::AtExitManager::RegisterCallback(&IncrementTestCounter2);
+  base::AtExitManager::RegisterCallback(&IncrementTestCounter1, NULL);
+  base::AtExitManager::RegisterCallback(&ExpectCounter1IsZero, NULL);
+  base::AtExitManager::RegisterCallback(&IncrementTestCounter2, NULL);
   
   EXPECT_EQ(0, g_test_counter_1);
   EXPECT_EQ(0, g_test_counter_2);
   base::AtExitManager::ProcessCallbacksNow();
   EXPECT_EQ(1, g_test_counter_1);
   EXPECT_EQ(1, g_test_counter_2);
 }
 
+TEST(AtExitTest, Param) {
+  ShadowingAtExitManager shadowing_at_exit_manager;
+
+  base::AtExitManager::RegisterCallback(&ExpectParamIsNull, NULL);
+  base::AtExitManager::RegisterCallback(&ExpectParamIsCounter,
+                                        &g_test_counter_1);
+  base::AtExitManager::ProcessCallbacksNow();
+}