GRIT: Enable variable expansion in filenames during HTML inlining.

grit/node/structure_unittest.py

Index: grit/node/structure_unittest.py
===================================================================
--- grit/node/structure_unittest.py	(revision 124)
+++ grit/node/structure_unittest.py	(working copy)
@@ -49,7 +49,7 @@
   def testVariables(self):
     grd = util.ParseGrdForUnittest('''
         <structures>
-          <structure type="chrome_html" name="hello_tmpl" file="structure_variables.html" expand_variables="true" variables="GREETING=Hello,THINGS=foo,, bar,, baz,EQUATION=2+2==4"></structure>
+          <structure type="chrome_html" name="hello_tmpl" file="structure_variables.html" expand_variables="true" variables="GREETING=Hello,THINGS=foo,, bar,, baz,EQUATION=2+2==4,filename=simple" flattenhtml="true"></structure>
         </structures>''', base_dir=util.PathFromRoot('grit/testdata'))
     grd.SetOutputLanguage('en')
     grd.RunGatherers()
@@ -57,9 +57,12 @@
     filename = node.Process(tempfile.gettempdir())
     with open(os.path.join(tempfile.gettempdir(), filename)) as f:
       result = f.read()
-      self.failUnless(result == ('<h1>Hello!</h1>\n'
-                                 'Some cool things are foo, bar, baz.\n'
-                                 'Did you know that 2+2==4?\n'))
+      self.failUnlessEqual(('<h1>Hello!</h1>\n'
+                            'Some cool things are foo, bar, baz.\n'
+                            'Did you know that 2+2==4?\n'
+                            '<p>\n'
+                            '  Hello!\n'
+                            '</p>\n'), result)
 
 
 if __name__ == '__main__':