Fix PrepareTextureCopyOutputResult to avoid ScopedCallbackRunner.

base/callback_helpers_unittest.cc

 // 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/callback_helpers.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 18 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) {
+TEST(BindHelpersTest, 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));
+    runner.ReplaceClosure(base::Bind(&Increment, &run_count_1));
+    runner.ReplaceClosure(base::Bind(&Increment, &run_count_2));
     EXPECT_EQ(1, run_count_1);

[danakj, 2016/06/27 22:49:57]

won't it be 0 now?

[Sergey Ulanov, 2016/06/28 19:15:57]

Done.

     EXPECT_EQ(0, run_count_2);
   }
   EXPECT_EQ(1, run_count_2);
+}
 
+TEST(BindHelpersTest, TestScopedClosureRunnerRunNow) {
   int run_count_3 = 0;
   {
     base::ScopedClosureRunner runner(base::Bind(&Increment, &run_count_3));
     EXPECT_EQ(0, run_count_3);
-    runner.Reset();
+    runner.RunNow();
     EXPECT_EQ(1, run_count_3);
   }
   EXPECT_EQ(1, run_count_3);
 }
 
 TEST(BindHelpersTest, TestScopedClosureRunnerMoveConstructor) {
   int run_count = 0;
   {
     std::unique_ptr<base::ScopedClosureRunner> runner(
         new base::ScopedClosureRunner(base::Bind(&Increment, &run_count)));
@@ skipping 10 matching lines @@
     base::ScopedClosureRunner runner;
     {
       base::ScopedClosureRunner runner2(base::Bind(&Increment, &run_count));
       runner = std::move(runner2);
     }
     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(1, run_count1);
-  EXPECT_EQ(1, run_count2);
-}
-
 }  // namespace