Redo escaping in GN

tools/gn/file_template_unittest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <sstream>
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "tools/gn/escape.h"
 #include "tools/gn/file_template.h"
 
@@ skipping 45 matching lines @@
   templates.push_back("-i");
   templates.push_back("{{source}}");
   templates.push_back("--out=foo bar\"{{source_name_part}}\".o");
   templates.push_back("");  // Test empty string.
 
   FileTemplate t(templates);
 
   std::ostringstream out;
   t.WriteWithNinjaExpansions(out);
 
+#if defined(OS_WIN)
   // The third argument should get quoted since it contains a space, and the
   // embedded quotes should get shell escaped.
   EXPECT_EQ(
       " -i ${source} \"--out=foo$ bar\\\"${source_name_part}\\\".o\" \"\"",
       out.str());
+#else
+  // On Posix we don't need to quote the whole thing and can escape all
+  // individual bad chars.
+  EXPECT_EQ(
+      " -i ${source} --out=foo\\$ bar\\\"${source_name_part}\\\".o \"\"",
+      out.str());
+#endif
 }
 
 TEST(FileTemplate, NinjaVariables) {
   std::vector<std::string> templates;
   templates.push_back("-i");
   templates.push_back("{{source}}");
   templates.push_back("--out=foo bar\"{{source_name_part}}\".o");
 
   FileTemplate t(templates);
 
   std::ostringstream out;
   EscapeOptions options;
-  options.mode = ESCAPE_NINJA_SHELL;
+  options.mode = ESCAPE_NINJA_COMMAND;
   t.WriteNinjaVariablesForSubstitution(out, "../../foo/bar.txt", options);
 
   // Just the variables used above should be written.
   EXPECT_EQ(
       "  source = ../../foo/bar.txt\n"
       "  source_name_part = bar\n",
       out.str());
 }