Minor cleanup to template code

BUG=None
TEST=None
R=darin@chromium.org, darin

Review URL: https://codereview.chromium.org/55133009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232237 0039d316-1c4b-4281-b951-d872f2087c98
SVN changes up to revision 232237