update_engine: Replace NULL with nullptr
Replaced the usage of NULL with nullptr. This also makes it possible to
use standard gtest macros to compare pointers in Update Manager's unit tests.
So, there is no need in custom UMTEST_... macros which are replaced with the
gtest macros (see change in update_engine/update_manager/umtest_utils.h):
UMTEST_ASSERT_NULL(p) => ASSERT_EQ(nullptr, p)
UMTEST_ASSERT_NOT_NULL(p) => ASSERT_NE(nullptr, p)
UMTEST_EXPECT_NULL(p) => EXPECT_EQ(nullptr, p)
UMTEST_EXPECT_NOT_NULL(p) => EXPECT_NE(nullptr, p)
BUG=None
TEST=FEATURES=test emerge-link update_engine
USE="clang asan" FEATURES=test emerge-link update_engine
Change-Id: I77a42a1e9ce992bb2f9f263db5cf75fe6110a4ec
Reviewed-on: https://chromium-review.googlesource.com/215136
Tested-by: Alex Vakulenko <avakulenko@chromium.org>
Reviewed-by: Alex Deymo <deymo@chromium.org>
Commit-Queue: Alex Vakulenko <avakulenko@chromium.org>
diff --git a/update_manager/fake_variable.h b/update_manager/fake_variable.h
index 6024b75..2dae3db 100644
--- a/update_manager/fake_variable.h
+++ b/update_manager/fake_variable.h
@@ -26,7 +26,8 @@
// Sets the next value of this variable to the passed |p_value| pointer. Once
// returned by GetValue(), the pointer is released and has to be set again.
- // A value of NULL means that the GetValue() call will fail and return NULL.
+ // A value of null means that the GetValue() call will fail and return
+ // null.
void reset(const T* p_value) {
ptr_.reset(p_value);
}
@@ -40,11 +41,11 @@
// Variable<T> overrides.
// Returns the pointer set with reset(). The ownership of the object is passed
// to the caller and the pointer is release from the FakeVariable. A second
- // call to GetValue() without reset() will return NULL and set the error
+ // call to GetValue() without reset() will return null and set the error
// message.
virtual const T* GetValue(base::TimeDelta /* timeout */,
std::string* errmsg) {
- if (ptr_ == NULL && errmsg != NULL)
+ if (ptr_ == nullptr && errmsg != nullptr)
*errmsg = this->GetName() + " is an empty FakeVariable";
// Passes the pointer ownership to the caller.
return ptr_.release();