| Index: cc/test/layer_tree_json_parser.cc
|
| diff --git a/cc/test/layer_tree_json_parser.cc b/cc/test/layer_tree_json_parser.cc
|
| index 1514d83487797aa8294f705d97a148fdbf33350a..3e841d6a19a0988a9e0626b14186431ec1681fa5 100644
|
| --- a/cc/test/layer_tree_json_parser.cc
|
| +++ b/cc/test/layer_tree_json_parser.cc
|
| @@ -80,7 +80,7 @@ scoped_refptr<Layer> ParseTreeFromValue(base::Value* val,
|
|
|
| new_layer = nine_patch_layer;
|
| } else if (layer_type == "TextureLayer") {
|
| - new_layer = TextureLayer::CreateForMailbox(NULL);
|
| + new_layer = TextureLayer::CreateForMailbox(nullptr);
|
| } else if (layer_type == "PictureLayer") {
|
| new_layer = PictureLayer::Create(content_client);
|
| } else { // Type "Layer" or "unknown"
|
| @@ -165,7 +165,7 @@ scoped_refptr<Layer> ParseTreeFromValue(base::Value* val,
|
| }
|
|
|
| if (!success)
|
| - return NULL;
|
| + return nullptr;
|
|
|
| return new_layer;
|
| }
|
|
|