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

Unified Diff: tools/gn/substitution_writer_unittest.cc

Issue 798333005: tools/gn: Pass clang-modernize -use-nullptr over it. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address Brett's review - revert some clang-format changes Created 6 years 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
« no previous file with comments | « tools/gn/substitution_type.cc ('k') | tools/gn/target.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/gn/substitution_writer_unittest.cc
diff --git a/tools/gn/substitution_writer_unittest.cc b/tools/gn/substitution_writer_unittest.cc
index 264dcea2444635c2565e9465322d7de928ad056a..b59475b8cfaa1829f79641230398bc9f65b5dfee 100644
--- a/tools/gn/substitution_writer_unittest.cc
+++ b/tools/gn/substitution_writer_unittest.cc
@@ -39,7 +39,7 @@ TEST(SubstitutionWriter, ApplyPatternToSource) {
SubstitutionPattern pattern;
Err err;
ASSERT_TRUE(pattern.Parse("{{source_gen_dir}}/{{source_name_part}}.tmp",
- NULL, &err));
+ nullptr, &err));
SourceFile result = SubstitutionWriter::ApplyPatternToSource(
setup.settings(), pattern, SourceFile("//foo/bar/myfile.txt"));
@@ -52,7 +52,7 @@ TEST(SubstitutionWriter, ApplyPatternToSourceAsOutputFile) {
SubstitutionPattern pattern;
Err err;
ASSERT_TRUE(pattern.Parse("{{source_gen_dir}}/{{source_name_part}}.tmp",
- NULL, &err));
+ nullptr, &err));
OutputFile result = SubstitutionWriter::ApplyPatternToSourceAsOutputFile(
setup.settings(), pattern, SourceFile("//foo/bar/myfile.txt"));
@@ -85,9 +85,8 @@ TEST(SubstitutionWriter, WriteNinjaVariablesForSource) {
TEST(SubstitutionWriter, WriteWithNinjaVariables) {
Err err;
SubstitutionPattern pattern;
- ASSERT_TRUE(pattern.Parse(
- "-i {{source}} --out=bar\"{{source_name_part}}\".o",
- NULL, &err));
+ ASSERT_TRUE(pattern.Parse("-i {{source}} --out=bar\"{{source_name_part}}\".o",
+ nullptr, &err));
EXPECT_FALSE(err.has_error());
EscapeOptions options;
@@ -250,8 +249,8 @@ TEST(SubstitutionWriter, LinkerSubstitutions) {
// Test that we handle paths that end up in the root build dir properly
// (no leading "./" or "/").
SubstitutionPattern pattern;
- ASSERT_TRUE(
- pattern.Parse("{{root_out_dir}}/{{target_output_name}}.so", NULL, &err));
+ ASSERT_TRUE(pattern.Parse("{{root_out_dir}}/{{target_output_name}}.so",
+ nullptr, &err));
OutputFile output = SubstitutionWriter::ApplyPatternToLinkerAsOutputFile(
&target, tool, pattern);
« no previous file with comments | « tools/gn/substitution_type.cc ('k') | tools/gn/target.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698