| Index: chromecast/base/bind_to_task_runner_unittest.cc
|
| diff --git a/media/base/bind_to_current_loop_unittest.cc b/chromecast/base/bind_to_task_runner_unittest.cc
|
| similarity index 62%
|
| copy from media/base/bind_to_current_loop_unittest.cc
|
| copy to chromecast/base/bind_to_task_runner_unittest.cc
|
| index 7fb56d48cdb0444805b42b3a55e21940a45b18e4..240c8f961c6f27e1009023a3fe30efb5f036fce6 100644
|
| --- a/media/base/bind_to_current_loop_unittest.cc
|
| +++ b/chromecast/base/bind_to_task_runner_unittest.cc
|
| @@ -1,8 +1,8 @@
|
| -// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| +// Copyright 2015 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 "media/base/bind_to_current_loop.h"
|
| +#include "chromecast/base/bind_to_task_runner.h"
|
|
|
| #include <utility>
|
|
|
| @@ -10,7 +10,7 @@
|
| #include "base/synchronization/waitable_event.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| -namespace media {
|
| +namespace chromecast {
|
|
|
| void BoundBoolSet(bool* var, bool val) {
|
| *var = val;
|
| @@ -41,36 +41,36 @@ void BoundIntegersSet(int* a_var, int* b_var, int a_val, int b_val) {
|
|
|
| // Various tests that check that the bound function is only actually executed
|
| // on the message loop, not during the original Run.
|
| -class BindToCurrentLoopTest : public ::testing::Test {
|
| +class BindToTaskRunnerTest : public ::testing::Test {
|
| protected:
|
| base::MessageLoop loop_;
|
| };
|
|
|
| -TEST_F(BindToCurrentLoopTest, Closure) {
|
| +TEST_F(BindToTaskRunnerTest, Closure) {
|
| // Test the closure is run inside the loop, not outside it.
|
| base::WaitableEvent waiter(false, false);
|
| - base::Closure cb = BindToCurrentLoop(base::Bind(
|
| - &base::WaitableEvent::Signal, base::Unretained(&waiter)));
|
| + base::Closure cb = BindToCurrentThread(
|
| + base::Bind(&base::WaitableEvent::Signal, Unretained(&waiter)));
|
| cb.Run();
|
| EXPECT_FALSE(waiter.IsSignaled());
|
| loop_.RunUntilIdle();
|
| EXPECT_TRUE(waiter.IsSignaled());
|
| }
|
|
|
| -TEST_F(BindToCurrentLoopTest, Bool) {
|
| +TEST_F(BindToTaskRunnerTest, Bool) {
|
| bool bool_var = false;
|
| - base::Callback<void(bool)> cb = BindToCurrentLoop(base::Bind(
|
| - &BoundBoolSet, &bool_var));
|
| + base::Callback<void(bool)> cb =
|
| + BindToCurrentThread(base::Bind(&BoundBoolSet, &bool_var));
|
| cb.Run(true);
|
| EXPECT_FALSE(bool_var);
|
| loop_.RunUntilIdle();
|
| EXPECT_TRUE(bool_var);
|
| }
|
|
|
| -TEST_F(BindToCurrentLoopTest, BoundScopedPtrBool) {
|
| +TEST_F(BindToTaskRunnerTest, BoundScopedPtrBool) {
|
| bool bool_val = false;
|
| scoped_ptr<bool> scoped_ptr_bool(new bool(true));
|
| - base::Closure cb = BindToCurrentLoop(base::Bind(
|
| + base::Closure cb = BindToCurrentThread(base::Bind(
|
| &BoundBoolSetFromScopedPtr, &bool_val, base::Passed(&scoped_ptr_bool)));
|
| cb.Run();
|
| EXPECT_FALSE(bool_val);
|
| @@ -78,87 +78,87 @@ TEST_F(BindToCurrentLoopTest, BoundScopedPtrBool) {
|
| EXPECT_TRUE(bool_val);
|
| }
|
|
|
| -TEST_F(BindToCurrentLoopTest, PassedScopedPtrBool) {
|
| +TEST_F(BindToTaskRunnerTest, PassedScopedPtrBool) {
|
| bool bool_val = false;
|
| scoped_ptr<bool> scoped_ptr_bool(new bool(true));
|
| - base::Callback<void(scoped_ptr<bool>)> cb = BindToCurrentLoop(base::Bind(
|
| - &BoundBoolSetFromScopedPtr, &bool_val));
|
| + base::Callback<void(scoped_ptr<bool>)> cb =
|
| + BindToCurrentThread(base::Bind(&BoundBoolSetFromScopedPtr, &bool_val));
|
| cb.Run(std::move(scoped_ptr_bool));
|
| EXPECT_FALSE(bool_val);
|
| loop_.RunUntilIdle();
|
| EXPECT_TRUE(bool_val);
|
| }
|
|
|
| -TEST_F(BindToCurrentLoopTest, BoundScopedArrayBool) {
|
| +TEST_F(BindToTaskRunnerTest, BoundScopedArrayBool) {
|
| bool bool_val = false;
|
| scoped_ptr<bool[]> scoped_array_bool(new bool[1]);
|
| scoped_array_bool[0] = true;
|
| - base::Closure cb = BindToCurrentLoop(base::Bind(
|
| - &BoundBoolSetFromScopedArray, &bool_val,
|
| - base::Passed(&scoped_array_bool)));
|
| + base::Closure cb =
|
| + BindToCurrentThread(base::Bind(&BoundBoolSetFromScopedArray, &bool_val,
|
| + base::Passed(&scoped_array_bool)));
|
| cb.Run();
|
| EXPECT_FALSE(bool_val);
|
| loop_.RunUntilIdle();
|
| EXPECT_TRUE(bool_val);
|
| }
|
|
|
| -TEST_F(BindToCurrentLoopTest, PassedScopedArrayBool) {
|
| +TEST_F(BindToTaskRunnerTest, PassedScopedArrayBool) {
|
| bool bool_val = false;
|
| scoped_ptr<bool[]> scoped_array_bool(new bool[1]);
|
| scoped_array_bool[0] = true;
|
| - base::Callback<void(scoped_ptr<bool[]>)> cb = BindToCurrentLoop(base::Bind(
|
| - &BoundBoolSetFromScopedArray, &bool_val));
|
| + base::Callback<void(scoped_ptr<bool[]>)> cb =
|
| + BindToCurrentThread(base::Bind(&BoundBoolSetFromScopedArray, &bool_val));
|
| cb.Run(std::move(scoped_array_bool));
|
| EXPECT_FALSE(bool_val);
|
| loop_.RunUntilIdle();
|
| EXPECT_TRUE(bool_val);
|
| }
|
|
|
| -TEST_F(BindToCurrentLoopTest, BoundScopedPtrFreeDeleterBool) {
|
| +TEST_F(BindToTaskRunnerTest, BoundScopedPtrFreeDeleterBool) {
|
| bool bool_val = false;
|
| scoped_ptr<bool, base::FreeDeleter> scoped_ptr_free_deleter_bool(
|
| static_cast<bool*>(malloc(sizeof(bool))));
|
| *scoped_ptr_free_deleter_bool = true;
|
| - base::Closure cb = BindToCurrentLoop(base::Bind(
|
| - &BoundBoolSetFromScopedPtrFreeDeleter, &bool_val,
|
| - base::Passed(&scoped_ptr_free_deleter_bool)));
|
| + base::Closure cb = BindToCurrentThread(
|
| + base::Bind(&BoundBoolSetFromScopedPtrFreeDeleter, &bool_val,
|
| + base::Passed(&scoped_ptr_free_deleter_bool)));
|
| cb.Run();
|
| EXPECT_FALSE(bool_val);
|
| loop_.RunUntilIdle();
|
| EXPECT_TRUE(bool_val);
|
| }
|
|
|
| -TEST_F(BindToCurrentLoopTest, PassedScopedPtrFreeDeleterBool) {
|
| +TEST_F(BindToTaskRunnerTest, PassedScopedPtrFreeDeleterBool) {
|
| bool bool_val = false;
|
| scoped_ptr<bool, base::FreeDeleter> scoped_ptr_free_deleter_bool(
|
| static_cast<bool*>(malloc(sizeof(bool))));
|
| *scoped_ptr_free_deleter_bool = true;
|
| base::Callback<void(scoped_ptr<bool, base::FreeDeleter>)> cb =
|
| - BindToCurrentLoop(base::Bind(&BoundBoolSetFromScopedPtrFreeDeleter,
|
| - &bool_val));
|
| + BindToCurrentThread(
|
| + base::Bind(&BoundBoolSetFromScopedPtrFreeDeleter, &bool_val));
|
| cb.Run(std::move(scoped_ptr_free_deleter_bool));
|
| EXPECT_FALSE(bool_val);
|
| loop_.RunUntilIdle();
|
| EXPECT_TRUE(bool_val);
|
| }
|
|
|
| -TEST_F(BindToCurrentLoopTest, BoolConstRef) {
|
| +TEST_F(BindToTaskRunnerTest, BoolConstRef) {
|
| bool bool_var = false;
|
| bool true_var = true;
|
| const bool& true_ref = true_var;
|
| - base::Closure cb = BindToCurrentLoop(base::Bind(
|
| - &BoundBoolSetFromConstRef, &bool_var, true_ref));
|
| + base::Closure cb = BindToCurrentThread(
|
| + base::Bind(&BoundBoolSetFromConstRef, &bool_var, true_ref));
|
| cb.Run();
|
| EXPECT_FALSE(bool_var);
|
| loop_.RunUntilIdle();
|
| EXPECT_TRUE(bool_var);
|
| }
|
|
|
| -TEST_F(BindToCurrentLoopTest, Integers) {
|
| +TEST_F(BindToTaskRunnerTest, Integers) {
|
| int a = 0;
|
| int b = 0;
|
| - base::Callback<void(int, int)> cb = BindToCurrentLoop(base::Bind(
|
| - &BoundIntegersSet, &a, &b));
|
| + base::Callback<void(int, int)> cb =
|
| + BindToCurrentThread(base::Bind(&BoundIntegersSet, &a, &b));
|
| cb.Run(1, -1);
|
| EXPECT_EQ(a, 0);
|
| EXPECT_EQ(b, 0);
|
| @@ -167,4 +167,4 @@ TEST_F(BindToCurrentLoopTest, Integers) {
|
| EXPECT_EQ(b, -1);
|
| }
|
|
|
| -} // namespace media
|
| +} // namespace chromecast
|
|
|