GN: Use build directory for CD for scripts

tools/gn/scope_per_file_provider.h

Index: tools/gn/scope_per_file_provider.h
diff --git a/tools/gn/scope_per_file_provider.h b/tools/gn/scope_per_file_provider.h
index 9e96d7b5e65de59f0d34aaf5d2ad06ad2c7fabbc..d406c2f2c8970c33821d6e069d60aca0074566ae 100644
--- a/tools/gn/scope_per_file_provider.h
+++ b/tools/gn/scope_per_file_provider.h
@@ -25,37 +25,24 @@ class ScopePerFileProvider : public Scope::ProgrammaticProvider {
   const Value* GetCurrentToolchain();
   const Value* GetDefaultToolchain();
   const Value* GetPythonPath();
-  const Value* GetRelativeBuildToSourceRootDir();
-  const Value* GetRelativeRootOutputDir();
-  const Value* GetRelativeRootGenDir();
-  const Value* GetRelativeSourceRootDir();
-  const Value* GetRelativeTargetOutputDir();
-  const Value* GetRelativeTargetGenDir();
   const Value* GetRootGenDir();
+  const Value* GetRootOutDir();
   const Value* GetTargetGenDir();
+  const Value* GetTargetOutDir();
 
   static std::string GetRootOutputDirWithNoLastSlash(const Settings* settings);
   static std::string GetRootGenDirWithNoLastSlash(const Settings* settings);
 
   std::string GetFileDirWithNoLastSlash() const;
-  std::string GetRelativeRootWithNoLastSlash() const;
-
-  // Inverts the given directory, returning it with no trailing slash. If the
-  // result would be empty, "." is returned to indicate the current dir.
-  static std::string InvertDirWithNoLastSlash(const SourceDir& dir);
 
   // All values are lazily created.
   scoped_ptr<Value> current_toolchain_;
   scoped_ptr<Value> default_toolchain_;
   scoped_ptr<Value> python_path_;
-  scoped_ptr<Value> relative_build_to_source_root_dir_;
-  scoped_ptr<Value> relative_root_output_dir_;
-  scoped_ptr<Value> relative_root_gen_dir_;
-  scoped_ptr<Value> relative_source_root_dir_;
-  scoped_ptr<Value> relative_target_output_dir_;
-  scoped_ptr<Value> relative_target_gen_dir_;
   scoped_ptr<Value> root_gen_dir_;
+  scoped_ptr<Value> root_out_dir_;
   scoped_ptr<Value> target_gen_dir_;
+  scoped_ptr<Value> target_out_dir_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopePerFileProvider);
 };