Fix PrepareTextureCopyOutputResult to avoid ScopedCallbackRunner.

base/callback_helpers_unittest.cc

Index: base/callback_helpers_unittest.cc
diff --git a/base/callback_helpers_unittest.cc b/base/callback_helpers_unittest.cc
index 0e42852f67315b69bdb6e79c93d16c23ff58d448..82839963795fcf39e657a3d9b1cd35df5b2ae215 100644
--- a/base/callback_helpers_unittest.cc
+++ b/base/callback_helpers_unittest.cc
@@ -14,7 +14,7 @@ void Increment(int* value) {
   (*value)++;
 }
 
-TEST(BindHelpersTest, TestScopedClosureRunnerExitScope) {
+TEST(CallbackHelpersTest, TestScopedClosureRunnerExitScope) {
   int run_count = 0;
   {
     base::ScopedClosureRunner runner(base::Bind(&Increment, &run_count));
@@ -23,7 +23,7 @@ TEST(BindHelpersTest, TestScopedClosureRunnerExitScope) {
   EXPECT_EQ(1, run_count);
 }
 
-TEST(BindHelpersTest, TestScopedClosureRunnerRelease) {
+TEST(CallbackHelpersTest, TestScopedClosureRunnerRelease) {
   int run_count = 0;
   base::Closure c;
   {
@@ -36,29 +36,32 @@ TEST(BindHelpersTest, TestScopedClosureRunnerRelease) {
   EXPECT_EQ(1, run_count);
 }
 
-TEST(BindHelpersTest, TestScopedClosureRunnerReset) {
+TEST(CallbackHelpersTest, TestScopedClosureRunnerReplaceClosure) {
   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);
+    runner.ReplaceClosure(base::Bind(&Increment, &run_count_1));
+    runner.ReplaceClosure(base::Bind(&Increment, &run_count_2));
+    EXPECT_EQ(0, run_count_1);
     EXPECT_EQ(0, run_count_2);
   }
+  EXPECT_EQ(0, run_count_1);
   EXPECT_EQ(1, run_count_2);
+}
 
+TEST(CallbackHelpersTest, TestScopedClosureRunnerRunAndReset) {
   int run_count_3 = 0;
   {
     base::ScopedClosureRunner runner(base::Bind(&Increment, &run_count_3));
     EXPECT_EQ(0, run_count_3);
-    runner.Reset();
+    runner.RunAndReset();
     EXPECT_EQ(1, run_count_3);
   }
   EXPECT_EQ(1, run_count_3);
 }
 
-TEST(BindHelpersTest, TestScopedClosureRunnerMoveConstructor) {
+TEST(CallbackHelpersTest, TestScopedClosureRunnerMoveConstructor) {
   int run_count = 0;
   {
     std::unique_ptr<base::ScopedClosureRunner> runner(
@@ -70,35 +73,22 @@ TEST(BindHelpersTest, TestScopedClosureRunnerMoveConstructor) {
   EXPECT_EQ(1, run_count);
 }
 
-TEST(BindHelpersTest, TestScopedClosureRunnerMoveAssignment) {
-  int run_count = 0;
+TEST(CallbackHelpersTest, TestScopedClosureRunnerMoveAssignment) {
+  int run_count_1 = 0;
+  int run_count_2 = 0;
   {
-    base::ScopedClosureRunner runner;
+    base::ScopedClosureRunner runner(base::Bind(&Increment, &run_count_1));
     {
-      base::ScopedClosureRunner runner2(base::Bind(&Increment, &run_count));
+      base::ScopedClosureRunner runner2(base::Bind(&Increment, &run_count_2));
       runner = std::move(runner2);
+      EXPECT_EQ(0, run_count_1);
+      EXPECT_EQ(0, run_count_2);
     }
-    EXPECT_EQ(0, run_count);
-  }
-  EXPECT_EQ(1, run_count);
-}
-
-TEST(BindHelpersTest, TestScopedClosureRunnerRunOnReplace) {
-  int run_count1 = 0;
-  int run_count2 = 0;
-  {
-    base::ScopedClosureRunner runner1(base::Bind(&Increment, &run_count1));
-    {
-      base::ScopedClosureRunner runner2(base::Bind(&Increment, &run_count2));
-      runner1 = std::move(runner2);
-      EXPECT_EQ(1, run_count1);
-      EXPECT_EQ(0, run_count2);
-    }
-    EXPECT_EQ(1, run_count1);
-    EXPECT_EQ(0, run_count2);
+    EXPECT_EQ(0, run_count_1);
+    EXPECT_EQ(0, run_count_2);
   }
-  EXPECT_EQ(1, run_count1);
-  EXPECT_EQ(1, run_count2);
+  EXPECT_EQ(0, run_count_1);
+  EXPECT_EQ(1, run_count_2);
 }
 
 }  // namespace