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

Unified Diff: cc/resources/resource_update_controller_unittest.cc

Issue 638353002: [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: Formating. 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/resources/resource_update_controller_unittest.cc
diff --git a/cc/resources/resource_update_controller_unittest.cc b/cc/resources/resource_update_controller_unittest.cc
index 18ad50739f5e4534401e023a788d78366af31ca6..d7688048ae7ad53a4ceaae549a6ce3e63727f2c9 100644
--- a/cc/resources/resource_update_controller_unittest.cc
+++ b/cc/resources/resource_update_controller_unittest.cc
@@ -127,7 +127,7 @@ class ResourceUpdateControllerTest : public Test {
shared_bitmap_manager_.reset(new TestSharedBitmapManager());
resource_provider_ = ResourceProvider::Create(output_surface_.get(),
shared_bitmap_manager_.get(),
- NULL,
+ nullptr,
0,
false,
1,
@@ -174,7 +174,7 @@ class ResourceUpdateControllerTest : public Test {
DebugScopedSetImplThreadAndMainThreadBlocked
impl_thread_and_main_thread_blocked(&proxy_);
scoped_ptr<ResourceUpdateController> update_controller =
- ResourceUpdateController::Create(NULL,
+ ResourceUpdateController::Create(nullptr,
proxy_.ImplThreadTaskRunner(),
queue_.Pass(),
resource_provider_.get());

Powered by Google App Engine
This is Rietveld 408576698