Add Reset to ScopedClosureRunner.

base/callback_helpers_unittest.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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_helpers.h"
+#include "base/callback_helpers.h"
 
+#include "base/bind.h"
 #include "base/callback.h"
-#include "base/bind.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 void Increment(int* value) {
   (*value)++;
 }
 
 TEST(BindHelpersTest, TestScopedClosureRunnerExitScope) {
   int run_count = 0;
@@ skipping 10 matching lines @@
   {
     base::ScopedClosureRunner runner(base::Bind(&Increment, &run_count));
     c = runner.Release();
     EXPECT_EQ(0, run_count);
   }
   EXPECT_EQ(0, run_count);
   c.Run();
   EXPECT_EQ(1, run_count);
 }
 
+TEST(BindHelpersTest, TestScopedClosureRunnerReset) {
+  int run_count_1 = 0;
+  int run_count_2 = 0;
+  {
+    base::ScopedClosureRunner runner;
+    runner.Reset(base::Bind(&Increment, &run_count_1));
+    runner.Reset(base::Bind(&Increment, &run_count_2));
+    EXPECT_EQ(1, run_count_1);
+    EXPECT_EQ(0, run_count_2);
+  }
+  EXPECT_EQ(1, run_count_2);
+
+  int run_count = 0;

[awong, 2013/08/29 21:00:39]

Call this run_count_3?

+  {
+    base::ScopedClosureRunner runner(base::Bind(&Increment, &run_count));
+    EXPECT_EQ(0, run_count);
+    runner.Reset();
+    EXPECT_EQ(1, run_count);
+  }
+  EXPECT_EQ(1, run_count);
+}
+
 }  // namespace