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

Unified Diff: cc/layers/delegated_frame_resource_collection_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_resource_collection_unittest.cc
diff --git a/cc/layers/delegated_frame_resource_collection_unittest.cc b/cc/layers/delegated_frame_resource_collection_unittest.cc
index 99c181e3f62c2a97e634548f8287278a82a39a5e..8ec716911b29b62187d3f7389de7dc85b6833eaf 100644
--- a/cc/layers/delegated_frame_resource_collection_unittest.cc
+++ b/cc/layers/delegated_frame_resource_collection_unittest.cc
@@ -33,8 +33,8 @@ class DelegatedFrameResourceCollectionTest
void DestroyResourceCollection() {
if (resource_collection_.get()) {
- resource_collection_->SetClient(NULL);
- resource_collection_ = NULL;
+ resource_collection_->SetClient(nullptr);
+ resource_collection_ = nullptr;
}
}
@@ -151,7 +151,7 @@ TEST_F(DelegatedFrameResourceCollectionTest, Thread) {
EXPECT_TRUE(returned_resources_[0].lost);
returned_resources_.clear();
- base::WaitableEvent* null_event = NULL;
+ base::WaitableEvent* null_event = nullptr;
thread.message_loop()->PostTask(FROM_HERE,
base::Bind(&ReturnResourcesOnThread,
return_callback,

Powered by Google App Engine
This is Rietveld 408576698