| Index: content/common/gpu/gpu_memory_manager_unittest.cc
|
| diff --git a/content/common/gpu/gpu_memory_manager_unittest.cc b/content/common/gpu/gpu_memory_manager_unittest.cc
|
| index a72d4673ee2364590b41bfdf18bf582f3918d268..d3f08082394d1472795723c2db851b5e767701a9 100644
|
| --- a/content/common/gpu/gpu_memory_manager_unittest.cc
|
| +++ b/content/common/gpu/gpu_memory_manager_unittest.cc
|
| @@ -87,7 +87,7 @@ class FakeClient : public GpuMemoryManagerClient {
|
| suggest_have_frontbuffer_(false),
|
| total_gpu_memory_(0),
|
| share_group_(share_group),
|
| - memory_tracker_(NULL) {
|
| + memory_tracker_(nullptr) {
|
| if (!share_group_) {
|
| memory_tracker_ = new FakeMemoryTracker();
|
| tracking_group_.reset(
|
| @@ -101,8 +101,8 @@ class FakeClient : public GpuMemoryManagerClient {
|
| : memmgr_(memmgr),
|
| suggest_have_frontbuffer_(false),
|
| total_gpu_memory_(0),
|
| - share_group_(NULL),
|
| - memory_tracker_(NULL) {
|
| + share_group_(nullptr),
|
| + memory_tracker_(nullptr) {
|
| memory_tracker_ = new FakeMemoryTracker();
|
| tracking_group_.reset(
|
| memmgr_->CreateTrackingGroup(0, memory_tracker_.get()));
|
| @@ -113,7 +113,7 @@ class FakeClient : public GpuMemoryManagerClient {
|
| virtual ~FakeClient() {
|
| client_state_.reset();
|
| tracking_group_.reset();
|
| - memory_tracker_ = NULL;
|
| + memory_tracker_ = nullptr;
|
| }
|
|
|
| virtual void SetMemoryAllocation(const MemoryAllocation& alloc) override {
|
|
|