Fix various stray bugs in the GN auto-roller, and repair the DEPS file.

tools/gn/bin/roll_gn.py

Index: tools/gn/bin/roll_gn.py
diff --git a/tools/gn/bin/roll_gn.py b/tools/gn/bin/roll_gn.py
index 580904a9e07a743d7ac0e450da2613133844be7f..a5da5121341e078fa495302cfc06fa3f84370b32 100644
--- a/tools/gn/bin/roll_gn.py
+++ b/tools/gn/bin/roll_gn.py
@@ -302,6 +302,10 @@ class GNRoller(object):
     # Fetch the revision we just committed so that RollDEPS will find it.
     self.Call('git fetch', cwd=self.buildtools_dir)
 
+    # Reset buildtools to the new commit so that we're not still on the
+    # merged branch.
+    self.Call('git checkout origin/master', cwd=self.buildtools_dir)
+
     return 0
 
   def RollDEPS(self):
@@ -322,7 +326,7 @@ class GNRoller(object):
         m = re.match(".*'buildtools_revision':.*'(.+)',", l)
         if m:
           old_buildtools_commitish = m.group(1)
-          new_deps_lines.append("  'buildtools_revision': '%s'," %
+          new_deps_lines.append("  'buildtools_revision': '%s',\n" %
                                 new_buildtools_commitish)
         else:
           new_deps_lines.append(l)
@@ -344,6 +348,10 @@ class GNRoller(object):
       self.Call('git-cl upload -f --send-mail --use-commit-queue')
     finally:
       os.remove(desc_file.name)
+
+    # Intentionally leave the src checkout on the new branch w/ the roll

[Nico, 2015/08/17 21:38:15]

s:w/:with

+    # since we're not auto-committing it.
+
     return 0
 
   def GetBuildtoolsDesc(self):