Revert 255357 "Change the user action file format from .txt to ...."

trunk/src/PRESUBMIT.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.
 
 """Top-level presubmit script for Chromium.
 
 See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
 for more details about the presubmit API built into gcl.
 """
 
@@ skipping 996 matching lines @@
 
   if cygwin_shell:
     return [output_api.PresubmitError(
       'These files should not use msvs_cygwin_shell (the default is 0):',
       items=cygwin_shell)]
   return []
 
 
 def _CheckUserActionUpdate(input_api, output_api):
   """Checks if any new user action has been added."""
-  if any('actions.xml' == input_api.os_path.basename(f) for f in
+  if any('chromeactions.txt' == input_api.os_path.basename(f) for f in
          input_api.LocalPaths()):
-    # If actions.xml is already included in the changelist, the PRESUBMIT
-    # for actions.xml will do a more complete presubmit check.
+    # If chromeactions.txt is already included in the changelist, the PRESUBMIT
+    # for chromeactions.txt will do a more complete presubmit check.
     return []
 
+  with open('tools/metrics/actions/chromeactions.txt') as f:
+    current_actions = f.read()
+
   file_filter = lambda f: f.LocalPath().endswith(('.cc', '.mm'))
   action_re = r'[^a-zA-Z]UserMetricsAction\("([^"]*)'
-  current_actions = None
   for f in input_api.AffectedFiles(file_filter=file_filter):
     for line_num, line in f.ChangedContents():
       match = input_api.re.search(action_re, line)
       if match:
-        # Loads contents in tools/metrics/actions/actions.xml to memory. It's
-        # loaded only once.
-        if not current_actions:
-          with open('tools/metrics/actions/actions.xml') as actions_f:
-            current_actions = actions_f.read()
-        # Search for the matched user action name in |current_actions|.
         for action_name in match.groups():
-          action = 'name="{0}"'.format(action_name)
-          if action not in current_actions:
+          name_pattern = r'\t%s\n' % action_name
+          if name_pattern not in current_actions:
             return [output_api.PresubmitPromptWarning(
               'File %s line %d: %s is missing in '
-              'tools/metrics/actions/actions.xml. Please run '
-              'tools/metrics/actions/extract_actions.py to update.'
+              'tools/metrics/actions/chromeactions.txt. Please run '
+              'tools/metrics/actions/extract_actions.py --hash to update.'
               % (f.LocalPath(), line_num, action_name))]
   return []
 
 
 def _CheckJavaStyle(input_api, output_api):
   """Runs checkstyle on changed java files and returns errors if any exist."""
   original_sys_path = sys.path
   try:
     sys.path = sys.path + [input_api.os_path.join(
         input_api.PresubmitLocalPath(), 'tools', 'android', 'checkstyle')]
@@ skipping 402 matching lines @@
     trybots.extend(GetDefaultTryConfigs(['cros_x86']))
 
   # The AOSP bot doesn't build the chrome/ layer, so ignore any changes to it
   # unless they're .gyp(i) files as changes to those files can break the gyp
   # step on that bot.
   if (not all(re.search('^chrome', f) for f in files) or
       any(re.search('\.gypi?$', f) for f in files)):
     trybots.extend(GetDefaultTryConfigs(['android_aosp']))
 
   return trybots