diff options
author | Luis Hector Chavez <lhchavez@google.com> | 2016-06-01 20:11:15 +0000 |
---|---|---|
committer | Luis Hector Chavez <lhchavez@google.com> | 2016-06-01 21:48:37 +0000 |
commit | 83db8f75afbb37010450a6a5607764dedf20db6b (patch) | |
tree | a125cec814362b362eefa3b70bec5eef746400b9 /third_party/chromium/base/bind_unittest.cc | |
parent | abfe7a063bbaebdca8703d27137c8c9aed826dac (diff) | |
download | libweave-83db8f75afbb37010450a6a5607764dedf20db6b.tar.gz |
Reland "Merge remote-tracking branch 'weave/master' into 'weave/aosp-master'"
This reverts commit abfe7a063bbaebdca8703d27137c8c9aed826dac.
All necessary changes are ready in AOSP for this to land.
Change-Id: I9ac99ebbb292e047e6d6a7978e5748987d7f0f9d
Reviewed-on: https://weave-review.googlesource.com/3720
Reviewed-by: Alex Vakulenko <avakulenko@google.com>
Diffstat (limited to 'third_party/chromium/base/bind_unittest.cc')
-rw-r--r-- | third_party/chromium/base/bind_unittest.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/third_party/chromium/base/bind_unittest.cc b/third_party/chromium/base/bind_unittest.cc index 76d158b..4c4f3e6 100644 --- a/third_party/chromium/base/bind_unittest.cc +++ b/third_party/chromium/base/bind_unittest.cc @@ -13,8 +13,8 @@ #include "base/callback.h" #include "base/macros.h" +#include "base/memory/ptr_util.h" #include "base/memory/ref_counted.h" -#include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "build/build_config.h" @@ -823,7 +823,7 @@ struct CustomDeleter { }; using MoveOnlyTypesToTest = - ::testing::Types<scoped_ptr<DeleteCounter>, + ::testing::Types<std::unique_ptr<DeleteCounter>, std::unique_ptr<DeleteCounter>, std::unique_ptr<DeleteCounter, CustomDeleter>>; TYPED_TEST_CASE(BindMoveOnlyTypeTest, MoveOnlyTypesToTest); @@ -880,23 +880,23 @@ TYPED_TEST(BindMoveOnlyTypeTest, UnboundForwarding) { EXPECT_EQ(1, deletes); } -void VerifyVector(const std::vector<scoped_ptr<int>>& v) { +void VerifyVector(const std::vector<std::unique_ptr<int>>& v) { ASSERT_EQ(1u, v.size()); EXPECT_EQ(12345, *v[0]); } -std::vector<scoped_ptr<int>> AcceptAndReturnMoveOnlyVector( - std::vector<scoped_ptr<int>> v) { +std::vector<std::unique_ptr<int>> AcceptAndReturnMoveOnlyVector( + std::vector<std::unique_ptr<int>> v) { VerifyVector(v); return v; } // Test that a vector containing move-only types can be used with Callback. TEST_F(BindTest, BindMoveOnlyVector) { - using MoveOnlyVector = std::vector<scoped_ptr<int>>; + using MoveOnlyVector = std::vector<std::unique_ptr<int>>; MoveOnlyVector v; - v.push_back(make_scoped_ptr(new int(12345))); + v.push_back(base::MakeUnique<int>(12345)); // Early binding should work: base::Callback<MoveOnlyVector()> bound_cb = |