Refactor GN source expansions.

tools/gn/filesystem_utils_unittest.cc

Index: tools/gn/filesystem_utils_unittest.cc
diff --git a/tools/gn/filesystem_utils_unittest.cc b/tools/gn/filesystem_utils_unittest.cc
index 4eaf0388449fe4dbf0e4c4b05552cd886b1dd1d5..973eac5a8472cbd2b791b3c122956b8195c89d6d 100644
--- a/tools/gn/filesystem_utils_unittest.cc
+++ b/tools/gn/filesystem_utils_unittest.cc
@@ -95,42 +95,25 @@ TEST(FilesystemUtils, EnsureStringIsInOutputDir) {
 
   // Some outside.
   Err err;
-  EXPECT_FALSE(EnsureStringIsInOutputDir(output_dir, "//foo", Value(), false,
-                                         &err));
+  EXPECT_FALSE(EnsureStringIsInOutputDir(output_dir, "//foo", Value(), &err));
   EXPECT_TRUE(err.has_error());
   err = Err();
   EXPECT_FALSE(EnsureStringIsInOutputDir(output_dir, "//out/Debugit", Value(),
-                                         false, &err));
+                                         &err));
   EXPECT_TRUE(err.has_error());
 
   // Some inside.
   err = Err();
   EXPECT_TRUE(EnsureStringIsInOutputDir(output_dir, "//out/Debug/", Value(),
-                                        false, &err));
+                                        &err));
   EXPECT_FALSE(err.has_error());
   EXPECT_TRUE(EnsureStringIsInOutputDir(output_dir, "//out/Debug/foo", Value(),
-                                        false, &err));
+                                        &err));
   EXPECT_FALSE(err.has_error());
 
   // Pattern but no template expansions are allowed.
   EXPECT_FALSE(EnsureStringIsInOutputDir(output_dir, "{{source_gen_dir}}",
-                                         Value(), false, &err));
-  EXPECT_TRUE(err.has_error());
-
-  // Pattern with template expansions allowed.
-  err = Err();
-  EXPECT_TRUE(EnsureStringIsInOutputDir(output_dir, "{{source_gen_dir}}",
-                                        Value(), true, &err));
-  EXPECT_FALSE(err.has_error());
-
-  // Template expansion that doesn't include the absolute directory.
-  EXPECT_FALSE(EnsureStringIsInOutputDir(output_dir, "{{source}}",
-                                         Value(), true, &err));
-  EXPECT_TRUE(err.has_error());
-  err = Err();
-  EXPECT_FALSE(EnsureStringIsInOutputDir(output_dir,
-                                        "{{source_root_relative_dir}}",
-                                        Value(), true, &err));
+                                         Value(), &err));
   EXPECT_TRUE(err.has_error());
 }