[NaCl SDK] Update build_version.ChromeVersion to return "trunk.###"

native_client_sdk/src/build_tools/build_version.py

 # Copyright (c) 2012 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.
 
 """Small utility library of python functions used during SDK building.
 """
 
 import os
 import re
 import sys
@@ skipping 11 matching lines @@
 VERSION_PATH = os.path.join(SRC_DIR, 'chrome', 'VERSION')
 
 
 def ChromeVersion():
   '''Extract chrome version from src/chrome/VERSION + svn.
 
   Returns:
     Chrome version string or trunk + svn rev.
   '''
   info = FetchVersionInfo()
-  if info.url.startswith('/trunk/'):
+  if info.url == 'refs/heads/master':
     return 'trunk.%s' % info.revision
   else:
     return ChromeVersionNoTrunk()
 
 
 def ChromeVersionNoTrunk():
   '''Extract the chrome version from src/chrome/VERSION.
   Ignore whether this is a trunk build.
 
   Returns:
@@ skipping 60 matching lines @@
   """
   Return the "commit-position" of the Chromium git repo. This should be
   equivalent to the SVN revision if one eixsts.
 
   This is a copy of the (recently reverted) change in lastchange.py.
   TODO(binji): Move this logic to lastchange.py when the dust settles.
   (see crbug.com/406783)
   """
   proc = lastchange.RunGitCommand(directory,
                                   ['show', '-s', '--format=%B', 'HEAD'])
-  pos = ''
   if proc:
     output = proc.communicate()[0]
     if proc.returncode == 0 and output:
       for line in reversed(output.splitlines()):
-        match = re.search('Cr-Commit-Position: .*@{#(\d+)}', line)
+        match = re.search('Cr-Commit-Position: (.*)@{#(\d+)}', line)
         if match:
-          pos = match.group(1)
-  if not pos:
-    return lastchange.VersionInfo(None, None)
-  return lastchange.VersionInfo('git', pos)
+          return lastchange.VersionInfo(match.group(1), match.group(2))
+  return lastchange.VersionInfo(None, None)