Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(663)

Unified Diff: cc/layers/delegated_frame_provider_unittest.cc

Issue 643583003: [C++11 Allowed Features] Declares a type-safe null pointer converting from NULL to nullptr in src/… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: foramted. Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: cc/layers/delegated_frame_provider_unittest.cc
diff --git a/cc/layers/delegated_frame_provider_unittest.cc b/cc/layers/delegated_frame_provider_unittest.cc
index 4a3f77e950307a14d954bce803785f9bdcade745..76af9a1d03d4db30c13bf5d6cb8024d3eb3d5713 100644
--- a/cc/layers/delegated_frame_provider_unittest.cc
+++ b/cc/layers/delegated_frame_provider_unittest.cc
@@ -67,7 +67,7 @@ class DelegatedFrameProviderTest
resource_collection_->SetClient(this);
}
- virtual void TearDown() override { resource_collection_->SetClient(NULL); }
+ virtual void TearDown() override { resource_collection_->SetClient(nullptr); }
virtual void UnusedResourcesAreAvailable() override {
resources_available_ = true;
@@ -106,7 +106,7 @@ TEST_F(DelegatedFrameProviderTest, SameResources) {
EXPECT_FALSE(ReturnAndResetResourcesAvailable());
EXPECT_EQ(0u, resources_.size());
- frame_provider_ = NULL;
+ frame_provider_ = nullptr;
EXPECT_TRUE(ReturnAndResetResourcesAvailable());
EXPECT_EQ(1u, resources_.size());
@@ -132,7 +132,7 @@ TEST_F(DelegatedFrameProviderTest, ReplaceResources) {
EXPECT_EQ(444u, resources_[0].id);
resources_.clear();
- frame_provider_ = NULL;
+ frame_provider_ = nullptr;
EXPECT_TRUE(ReturnAndResetResourcesAvailable());
EXPECT_EQ(1u, resources_.size());
@@ -272,11 +272,11 @@ TEST_F(DelegatedFrameProviderTest, RefResourcesInFrameProviderUntilDestroy) {
// Releasing all references to the frame provider will release
// the frame.
- observer1 = NULL;
- observer2 = NULL;
+ observer1 = nullptr;
+ observer2 = nullptr;
EXPECT_FALSE(ReturnAndResetResourcesAvailable());
- frame_provider_ = NULL;
+ frame_provider_ = nullptr;
EXPECT_TRUE(ReturnAndResetResourcesAvailable());
EXPECT_EQ(1u, resources_.size());
@@ -386,7 +386,7 @@ TEST_F(DelegatedFrameProviderTest, NothingReturnedAfterLoss) {
EXPECT_TRUE(ReturnAndResetResourcesAvailable());
resources_.clear();
- frame_provider_ = NULL;
+ frame_provider_ = nullptr;
// Nothing is returned twice.
EXPECT_FALSE(ReturnAndResetResourcesAvailable());

Powered by Google App Engine
This is Rietveld 408576698