Commit 7105b7f5 authored by Peter Kasting's avatar Peter Kasting Committed by Commit Bot

Clang-tidy autofixes for base/win/.

Bug: none
Change-Id: I979c06fa784573603570fd82eff7f55b20029cab
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2483382
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Commit-Queue: Robert Liao <robliao@chromium.org>
Reviewed-by: default avatarRobert Liao <robliao@chromium.org>
Auto-Submit: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#819134}
parent 4884c231
......@@ -110,7 +110,7 @@ class AsyncOperation
base::BindOnce(&AsyncOperation::OnResult, weak_factory_.GetWeakPtr());
}
~AsyncOperation() { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); }
~AsyncOperation() override { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); }
// ABI::Windows::Foundation::IAsyncOperation:
IFACEMETHODIMP put_Completed(Handler* handler) override {
......
......@@ -35,7 +35,7 @@ struct OptionalHeaderTraits<IMAGE_OPTIONAL_HEADER64> {
template <class OPTIONAL_HEADER_TYPE>
class PeImageReader::OptionalHeaderImpl : public PeImageReader::OptionalHeader {
public:
typedef OptionalHeaderTraits<OPTIONAL_HEADER_TYPE> TraitsType;
using TraitsType = OptionalHeaderTraits<OPTIONAL_HEADER_TYPE>;
explicit OptionalHeaderImpl(const uint8_t* optional_header_start)
: optional_header_(reinterpret_cast<const OPTIONAL_HEADER_TYPE*>(
......@@ -62,8 +62,7 @@ class PeImageReader::OptionalHeaderImpl : public PeImageReader::OptionalHeader {
DISALLOW_COPY_AND_ASSIGN(OptionalHeaderImpl);
};
PeImageReader::PeImageReader()
: image_data_(), image_size_(), validation_state_() {}
PeImageReader::PeImageReader() {}
PeImageReader::~PeImageReader() {
Clear();
......@@ -249,11 +248,13 @@ bool PeImageReader::ValidateOptionalHeader() {
std::unique_ptr<OptionalHeader> optional_header;
if (*optional_header_magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
optional_header.reset(new OptionalHeaderImpl<IMAGE_OPTIONAL_HEADER32>(
image_data_ + optional_header_offset));
optional_header =
std::make_unique<OptionalHeaderImpl<IMAGE_OPTIONAL_HEADER32>>(
image_data_ + optional_header_offset);
} else if (*optional_header_magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) {
optional_header.reset(new OptionalHeaderImpl<IMAGE_OPTIONAL_HEADER64>(
image_data_ + optional_header_offset));
optional_header =
std::make_unique<OptionalHeaderImpl<IMAGE_OPTIONAL_HEADER64>>(
image_data_ + optional_header_offset);
} else {
return false;
}
......
......@@ -36,11 +36,11 @@ class BASE_EXPORT PeImageReader {
// |certificate_data_size| bytes). |context| is the value provided by the
// caller to EnumCertificates(). Implementations must return true to continue
// the enumeration, or false to abort.
typedef bool (*EnumCertificatesCallback)(uint16_t revision,
uint16_t certificate_type,
const uint8_t* certificate_data,
size_t certificate_data_size,
void* context);
using EnumCertificatesCallback = bool (*)(uint16_t revision,
uint16_t certificate_type,
const uint8_t* certificate_data,
size_t certificate_data_size,
void* context);
PeImageReader();
~PeImageReader();
......@@ -91,7 +91,7 @@ class BASE_EXPORT PeImageReader {
// An interface to an image's optional header.
class OptionalHeader {
public:
virtual ~OptionalHeader() {}
virtual ~OptionalHeader() = default;
virtual WordSize GetWordSize() = 0;
......@@ -161,9 +161,9 @@ class BASE_EXPORT PeImageReader {
return true;
}
const uint8_t* image_data_;
size_t image_size_;
uint32_t validation_state_;
const uint8_t* image_data_ = nullptr;
size_t image_size_ = 0;
uint32_t validation_state_ = 0;
std::unique_ptr<OptionalHeader> optional_header_;
DISALLOW_COPY_AND_ASSIGN(PeImageReader);
};
......
......@@ -186,8 +186,8 @@ class CertificateReceiver {
}
protected:
CertificateReceiver() {}
virtual ~CertificateReceiver() {}
CertificateReceiver() = default;
virtual ~CertificateReceiver() = default;
virtual bool OnCertificate(uint16_t revision,
uint16_t certificate_type,
const uint8_t* certificate_data,
......@@ -196,7 +196,7 @@ class CertificateReceiver {
class MockCertificateReceiver : public CertificateReceiver {
public:
MockCertificateReceiver() {}
MockCertificateReceiver() = default;
MOCK_METHOD4(OnCertificate, bool(uint16_t, uint16_t, const uint8_t*, size_t));
private:
......
......@@ -40,11 +40,7 @@ class BASE_EXPORT ScopedSafearray {
using pointer = value_type*;
using const_pointer = const value_type*;
LockScope()
: safearray_(nullptr),
vartype_(VT_EMPTY),
array_(nullptr),
array_size_(0U) {}
LockScope() = default;
LockScope(LockScope<ElementVartype>&& other)
: safearray_(std::exchange(other.safearray_, nullptr)),
......@@ -107,10 +103,10 @@ class BASE_EXPORT ScopedSafearray {
array_size_ = 0U;
}
SAFEARRAY* safearray_;
VARTYPE vartype_;
pointer array_;
size_t array_size_;
SAFEARRAY* safearray_ = nullptr;
VARTYPE vartype_ = VT_EMPTY;
pointer array_ = nullptr;
size_t array_size_ = 0U;
friend class ScopedSafearray;
DISALLOW_COPY_AND_ASSIGN(LockScope);
......
......@@ -230,7 +230,7 @@ BASE_EXPORT bool IsCurrentSessionRemote();
// The original state is restored upon destruction.
class BASE_EXPORT ScopedDomainStateForTesting {
public:
ScopedDomainStateForTesting(bool state);
explicit ScopedDomainStateForTesting(bool state);
~ScopedDomainStateForTesting();
private:
......@@ -242,7 +242,7 @@ class BASE_EXPORT ScopedDomainStateForTesting {
// object. The original state is restored upon destruction.
class BASE_EXPORT ScopedDeviceRegisteredWithManagementForTesting {
public:
ScopedDeviceRegisteredWithManagementForTesting(bool state);
explicit ScopedDeviceRegisteredWithManagementForTesting(bool state);
~ScopedDeviceRegisteredWithManagementForTesting();
private:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment