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

Unified Diff: cc/resources/prioritized_resource_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/prioritized_resource_unittest.cc
diff --git a/cc/resources/prioritized_resource_unittest.cc b/cc/resources/prioritized_resource_unittest.cc
index 05e87d9c03d0aeab83739e3cb33cc6b3468d4b55..dbf38c37467e0d7405ad25461d4837aa9f639e26 100644
--- a/cc/resources/prioritized_resource_unittest.cc
+++ b/cc/resources/prioritized_resource_unittest.cc
@@ -30,7 +30,7 @@ class PrioritizedResourceTest : public testing::Test {
shared_bitmap_manager_.reset(new TestSharedBitmapManager());
resource_provider_ = ResourceProvider::Create(output_surface_.get(),
shared_bitmap_manager_.get(),
- NULL,
+ nullptr,
0,
false,
1,
@@ -752,7 +752,7 @@ TEST_F(PrioritizedResourceTest, TextureMovedToNewManager) {
EXPECT_TRUE(texture->can_acquire_backing_texture());
EXPECT_TRUE(texture->have_backing_texture());
- texture->SetTextureManager(NULL);
+ texture->SetTextureManager(nullptr);
{
DebugScopedSetImplThreadAndMainThreadBlocked
impl_thread_and_main_thread_blocked(&proxy_);
@@ -1010,7 +1010,7 @@ TEST_F(PrioritizedResourceTest, ClearUploadsToEvictedResources) {
impl_thread_and_main_thread_blocked(&proxy_);
for (size_t i = 0; i < kMaxTextures; ++i) {
const ResourceUpdate upload = ResourceUpdate::Create(
- textures[i].get(), NULL, gfx::Rect(), gfx::Rect(), gfx::Vector2d());
+ textures[i].get(), nullptr, gfx::Rect(), gfx::Rect(), gfx::Vector2d());
queue.AppendFullUpload(upload);
}

Powered by Google App Engine
This is Rietveld 408576698