Improve script to find user actions.

tools/metrics/actions/extract_actions_test.py

 #!/usr/bin/env python
 # Copyright 2014 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.
 
 import unittest
 
 import extract_actions
 
 # Empty value to be inserted to |ACTIONS_MOCK|.
@@ skipping 96 matching lines @@
     '<!--comment-->\n\n'
     '<actions>\n\n'
     '<action name="action1">\n'
     '  <owner>name1@google.com</owner>\n'
     '  <owner>name2@google.com</owner>\n'
     '  <description>Description.</description>\n'
     '</action>\n\n'
     '</actions>\n'
 )
 
-
 class ActionXmlTest(unittest.TestCase):
 
   def _GetProcessedAction(self, owner, description, obsolete, new_actions=[],
                           comment=NO_VALUE):
     """Forms an actions XML string and returns it after processing.
 
     It parses the original XML string, adds new user actions (if there is any),
     and pretty prints it.
 
     Args:
@@ skipping 59 matching lines @@
   def testAddNewActions(self):
     xml_result = self._GetProcessedAction(TWO_OWNERS, DESCRIPTION, NO_VALUE,
                                           new_actions=['action2'])
     self.assertEqual(ADD_ACTION_EXPECTED_XML, xml_result)
 
   def testComment(self):
     xml_result = self._GetProcessedAction(TWO_OWNERS, DESCRIPTION, NO_VALUE,
                                           comment=COMMENT)
     self.assertEqual(COMMENT_EXPECTED_XML, xml_result)
 
+  def testUserMetricsActionSpanningTwoLines(self):
+    code = 'base::UserMetricsAction(\n"Foo.Bar"));'
+    names, _ = extract_actions.FindActionNames(code, 0)
+    self.assertEqual(['Foo.Bar'], names)
+
+  def testTernaryUserMetricsAction(self):
+    code = 'base::UserMetricsAction(foo ? "Foo.Bar" : "Bar.Foo"));'
+    names, _ = extract_actions.FindActionNames(code, 0)
+    self.assertEqual(['Foo.Bar', 'Bar.Foo'], names)
+
+  def testUserMetricsActionAsAParam(self):
+    code = 'base::UserMetricsAction("Test.Foo"), "Test.Bar");'
+    names, _ = extract_actions.FindActionNames(code, 0)
+    self.assertEqual(['Test.Foo'], names)
 
 if __name__ == '__main__':
   unittest.main()