Remove DISALLOW_COPY_AND_ASSIGN from base/*
Also fix cpp lint warnings. No functional changes.
Bug: 1010217
Change-Id: I60c13a4f4667522c7661b3ab91b948e71a06e657
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2432204
Commit-Queue: David Bienvenu <[email protected]>
Reviewed-by: Lei Zhang <[email protected]>
Cr-Commit-Position: refs/heads/master@{#811059}
diff --git a/base/observer_list_unittest.cc b/base/observer_list_unittest.cc
index f37d693..8fe0950 100644
--- a/base/observer_list_unittest.cc
+++ b/base/observer_list_unittest.cc
@@ -4,6 +4,8 @@
#include "base/observer_list.h"
+#include <memory>
+
#include "base/strings/string_piece.h"
#include "base/test/gtest_util.h"
#include "base/threading/simple_thread.h"
@@ -143,7 +145,9 @@
class ObserverListTestBase {
public:
- ObserverListTestBase() {}
+ ObserverListTestBase() = default;
+ ObserverListTestBase(const ObserverListTestBase&) = delete;
+ ObserverListTestBase& operator=(const ObserverListTestBase&) = delete;
template <class T>
const decltype(T::list_.get()) list(const T& iter) {
@@ -163,9 +167,6 @@
EXPECT_DCHECK_DEATH(return iter->GetCurrent());
return nullptr;
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ObserverListTestBase);
};
// Templatized test fixture that can pick between CheckedBase and UncheckedBase.
@@ -179,10 +180,9 @@
using iterator = typename ObserverList<ObserverType>::iterator;
using const_iterator = typename ObserverList<ObserverType>::const_iterator;
- ObserverListTest() {}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ObserverListTest);
+ ObserverListTest() = default;
+ ObserverListTest(const ObserverListTest&) = delete;
+ ObserverListTest& operator=(const ObserverListTest&) = delete;
};
using ObserverTypes = ::testing::Types<CheckedBase, UncheckedBase>;
@@ -200,10 +200,10 @@
using Disrupter = DisrupterT<ObserverListFoo>; \
using const_iterator = typename TestFixture::const_iterator; \
using iterator = typename TestFixture::iterator; \
- (void)(Disrupter*)(0); \
- (void)(Adder*)(0); \
- (void)(const_iterator*)(0); \
- (void)(iterator*)(0)
+ (void)reinterpret_cast<Disrupter*>(0); \
+ (void)reinterpret_cast<Adder*>(0); \
+ (void)reinterpret_cast<const_iterator*>(0); \
+ (void)reinterpret_cast<iterator*>(0)
TYPED_TEST(ObserverListTest, BasicTest) {
DECLARE_TYPES;
@@ -950,26 +950,26 @@
class TestCheckedObserver : public CheckedObserver {
public:
explicit TestCheckedObserver(int* count) : count_(count) {}
+ TestCheckedObserver(const TestCheckedObserver&) = delete;
+ TestCheckedObserver& operator=(const TestCheckedObserver&) = delete;
void Observe() { ++(*count_); }
private:
int* count_;
-
- DISALLOW_COPY_AND_ASSIGN(TestCheckedObserver);
};
// A second, identical observer, used to test multiple inheritance.
class TestCheckedObserver2 : public CheckedObserver {
public:
explicit TestCheckedObserver2(int* count) : count_(count) {}
+ TestCheckedObserver2(const TestCheckedObserver2&) = delete;
+ TestCheckedObserver2& operator=(const TestCheckedObserver2&) = delete;
void Observe() { ++(*count_); }
private:
int* count_;
-
- DISALLOW_COPY_AND_ASSIGN(TestCheckedObserver2);
};
using CheckedObserverListTest = ::testing::Test;
