Make Callback::Reset() return a copy to support use-cases where Run() ends up modifying |*this|.

media/base/composite_filter_unittest.cc

 // Copyright (c) 2012 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.h"
+#include "base/callback_helpers.h"
 #include "base/message_loop.h"
 #include "media/base/composite_filter.h"
 #include "media/base/mock_callback.h"
 #include "media/base/mock_filter_host.h"
 #include "media/base/mock_filters.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
 using ::testing::InSequence;
 using ::testing::Return;
@@ skipping 313 matching lines @@
 
 bool CompositeFilterTest::HasFilter1Callback() const {
   CHECK(filter_1_cb_.is_null() || filter_1_status_cb_.is_null());
   return !filter_1_cb_.is_null() || !filter_1_status_cb_.is_null();
 }
 
 void CompositeFilterTest::RunFilter1Callback() {
   EXPECT_TRUE(HasFilter1Callback());
 
   if (!filter_1_status_cb_.is_null()) {
-    ResetAndRunCB(&filter_1_status_cb_, filter_1_status_);
+    base::ResetAndReturn(&filter_1_status_cb_).Run(filter_1_status_);
     filter_1_status_ = PIPELINE_OK;
     return;
   }
 
   EXPECT_TRUE(!filter_1_cb_.is_null());
   base::Closure callback = filter_1_cb_;
   filter_1_cb_.Reset();
   callback.Run();
 }
 
 bool CompositeFilterTest::HasFilter2Callback() const {
   CHECK(filter_2_cb_.is_null() || filter_2_status_cb_.is_null());
   return !filter_2_cb_.is_null() || !filter_2_status_cb_.is_null();
 }
 
 void CompositeFilterTest::RunFilter2Callback() {
   EXPECT_TRUE(HasFilter2Callback());
 
   if (!filter_2_status_cb_.is_null()) {
-    ResetAndRunCB(&filter_2_status_cb_, filter_2_status_);
+    base::ResetAndReturn(&filter_2_status_cb_).Run(filter_2_status_);
     filter_2_status_ = PIPELINE_OK;
     return;
   }
 
   EXPECT_FALSE(filter_2_cb_.is_null());
   base::Closure callback = filter_2_cb_;
   filter_2_cb_.Reset();
   callback.Run();
 }
 
@@ skipping 418 matching lines @@
                    NewExpectedStatusCB(PIPELINE_OK));
 
   // Issue a Play() and expect no errors.
   composite_->Play(NewExpectedClosure());
 
   // Issue a Stop() and expect no errors.
   composite_->Stop(NewExpectedClosure());
 }
 
 }  // namespace media