diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-01-29 16:35:13 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-02-01 15:33:35 +0000 |
commit | c8c2d1901aec01e934adf561a9fdf0cc776cdef8 (patch) | |
tree | 9157c3d9815e5870799e070b113813bec53e0535 /chromium/base/bind_unittest.cc | |
parent | abefd5095b41dac94ca451d784ab6e27372e981a (diff) | |
download | qtwebengine-chromium-c8c2d1901aec01e934adf561a9fdf0cc776cdef8.tar.gz |
BASELINE: Update Chromium to 64.0.3282.139
Change-Id: I1cae68fe9c94ff7608b26b8382fc19862cdb293a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/base/bind_unittest.cc')
-rw-r--r-- | chromium/base/bind_unittest.cc | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/chromium/base/bind_unittest.cc b/chromium/base/bind_unittest.cc index ef948c19a46..7deba473e97 100644 --- a/chromium/base/bind_unittest.cc +++ b/chromium/base/bind_unittest.cc @@ -31,7 +31,7 @@ class IncompleteType; class NoRef { public: - NoRef() {} + NoRef() = default; MOCK_METHOD0(VoidMethod0, void()); MOCK_CONST_METHOD0(VoidConstMethod0, void()); @@ -49,7 +49,7 @@ class NoRef { class HasRef : public NoRef { public: - HasRef() {} + HasRef() = default; MOCK_CONST_METHOD0(AddRef, void()); MOCK_CONST_METHOD0(Release, bool()); @@ -61,7 +61,7 @@ class HasRef : public NoRef { class HasRefPrivateDtor : public HasRef { private: - ~HasRefPrivateDtor() {} + ~HasRefPrivateDtor() = default; }; static const int kParentValue = 1; @@ -196,11 +196,8 @@ class CopyCounter { public: CopyCounter(int* copies, int* assigns) : counter_(copies, assigns, nullptr, nullptr) {} - CopyCounter(const CopyCounter& other) : counter_(other.counter_) {} - CopyCounter& operator=(const CopyCounter& other) { - counter_ = other.counter_; - return *this; - } + CopyCounter(const CopyCounter& other) = default; + CopyCounter& operator=(const CopyCounter& other) = default; explicit CopyCounter(const DerivedCopyMoveCounter& other) : counter_(other) {} @@ -321,8 +318,7 @@ class BindTest : public ::testing::Test { static_func_mock_ptr = &static_func_mock_; } - virtual ~BindTest() { - } + virtual ~BindTest() = default; static void VoidFunc0() { static_func_mock_ptr->VoidMethod0(); |