diff options
| author | tzik <tzik@chromium.org> | 2015-12-14 22:41:49 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-15 06:42:38 +0000 |
| commit | ce3ecf87d878414a8b475549c72ae799f1e1c5c9 (patch) | |
| tree | cfeb81b71fea92c6c2a6b6171ad2a1f18c21d446 /base/callback_unittest.cc | |
| parent | 1c3ff0ea380d91301215c7bfe966b992e62c2bdb (diff) | |
| download | chromium_src-ce3ecf87d878414a8b475549c72ae799f1e1c5c9.zip chromium_src-ce3ecf87d878414a8b475549c72ae799f1e1c5c9.tar.gz chromium_src-ce3ecf87d878414a8b475549c72ae799f1e1c5c9.tar.bz2 | |
Clean up base::Callback stuff
* Typo fix
* Remove unused or duplicated forward decls
* Make Callback ctor explicit
* Simplify BindState param by expanding TypeList
BUG=
Review URL: https://codereview.chromium.org/1507143003
Cr-Commit-Position: refs/heads/master@{#365184}
Diffstat (limited to 'base/callback_unittest.cc')
| -rw-r--r-- | base/callback_unittest.cc | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/base/callback_unittest.cc b/base/callback_unittest.cc index 2844aa9..5daef95 100644 --- a/base/callback_unittest.cc +++ b/base/callback_unittest.cc @@ -23,8 +23,6 @@ struct FakeInvoker { } // namespace namespace internal { -template <typename Runnable, typename RunType, typename BoundArgsType> -struct BindState; // White-box testpoints to inject into a Callback<> object for checking // comparators and emptiness APIs. Use a BindState that is specialized @@ -32,7 +30,7 @@ struct BindState; // chance of colliding with another instantiation and breaking the // one-definition-rule. template <> -struct BindState<void(void), void(void), void(FakeInvoker)> +struct BindState<void(void), void(void), FakeInvoker> : public BindStateBase { public: BindState() : BindStateBase(&Destroy) {} @@ -45,8 +43,7 @@ struct BindState<void(void), void(void), void(FakeInvoker)> }; template <> -struct BindState<void(void), void(void), - void(FakeInvoker, FakeInvoker)> +struct BindState<void(void), void(void), FakeInvoker, FakeInvoker> : public BindStateBase { public: BindState() : BindStateBase(&Destroy) {} @@ -61,11 +58,10 @@ struct BindState<void(void), void(void), namespace { -typedef internal::BindState<void(void), void(void), void(FakeInvoker)> +typedef internal::BindState<void(void), void(void), FakeInvoker> FakeBindState1; -typedef internal::BindState<void(void), void(void), - void(FakeInvoker, FakeInvoker)> - FakeBindState2; +typedef internal::BindState<void(void), void(void), FakeInvoker, FakeInvoker> + FakeBindState2; class CallbackTest : public ::testing::Test { public: |