Improve script to find user actions.

tools/metrics/actions/extract_actions_test.py

Index: tools/metrics/actions/extract_actions_test.py
diff --git a/tools/metrics/actions/extract_actions_test.py b/tools/metrics/actions/extract_actions_test.py
index a5cfd387717a1b2498ebdc099c991e5e0d8611be..1c8706426ed6ed0cb0e1cbe429749f179a39832a 100755
--- a/tools/metrics/actions/extract_actions_test.py
+++ b/tools/metrics/actions/extract_actions_test.py
@@ -114,7 +114,6 @@ COMMENT_EXPECTED_XML = (
     '</actions>\n'
 )
 
-
 class ActionXmlTest(unittest.TestCase):
 
   def _GetProcessedAction(self, owner, description, obsolete, new_actions=[],
@@ -194,6 +193,20 @@ class ActionXmlTest(unittest.TestCase):
                                           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()