Add ASYNC_STEP support to trace_event and change START to ASYNC_BEGIN.

base/debug/trace_event_unittest.cc

Index: base/debug/trace_event_unittest.cc
diff --git a/base/debug/trace_event_unittest.cc b/base/debug/trace_event_unittest.cc
index befd4e8b2473829f8f8756b5415135471953452c..11d9662acaffa33a6bb4c3e9457241f60cafb0f4 100644
--- a/base/debug/trace_event_unittest.cc
+++ b/base/debug/trace_event_unittest.cc
@@ -323,19 +323,19 @@ void TraceWithAllMacroVariants(WaitableEvent* task_complete_event) {
                                 "name1", "value1",
                                 "name2", "value2");
 
-    TRACE_EVENT_START0("all", "TRACE_EVENT_START0 call", 5);
-    TRACE_EVENT_START1("all", "TRACE_EVENT_START1 call", 5,

[nduca, 2012/02/28 23:55:26]

tests for the step?

[jbates, 2012/02/29 00:34:19]

Done.

-                       "name1", "value1");
-    TRACE_EVENT_START2("all", "TRACE_EVENT_START2 call", 5,
-                       "name1", "value1",
-                       "name2", "value2");
-
-    TRACE_EVENT_FINISH0("all", "TRACE_EVENT_FINISH0 call", 5);
-    TRACE_EVENT_FINISH1("all", "TRACE_EVENT_FINISH1 call", 5,
-                        "name1", "value1");
-    TRACE_EVENT_FINISH2("all", "TRACE_EVENT_FINISH2 call", 5,
-                        "name1", "value1",
-                        "name2", "value2");
+    TRACE_EVENT_ASYNC_BEGIN0("all", "TRACE_EVENT_ASYNC_BEGIN0 call", 5);
+    TRACE_EVENT_ASYNC_BEGIN1("all", "TRACE_EVENT_ASYNC_BEGIN1 call", 5,
+                             "name1", "value1");
+    TRACE_EVENT_ASYNC_BEGIN2("all", "TRACE_EVENT_ASYNC_BEGIN2 call", 5,
+                             "name1", "value1",
+                             "name2", "value2");
+
+    TRACE_EVENT_ASYNC_END0("all", "TRACE_EVENT_ASYNC_END0 call", 5);
+    TRACE_EVENT_ASYNC_END1("all", "TRACE_EVENT_ASYNC_END1 call", 5,
+                           "name1", "value1");
+    TRACE_EVENT_ASYNC_END2("all", "TRACE_EVENT_ASYNC_END2 call", 5,
+                           "name1", "value1",
+                           "name2", "value2");
 
     TRACE_EVENT_BEGIN_ETW("TRACE_EVENT_BEGIN_ETW0 call", 5, NULL);
     TRACE_EVENT_BEGIN_ETW("TRACE_EVENT_BEGIN_ETW1 call", 5, "value");
@@ -440,15 +440,15 @@ void ValidateAllTraceMacrosCreatedData(const ListValue& trace_parsed) {
   EXPECT_SUB_FIND_("name2");
   EXPECT_SUB_FIND_("value2");
 
-  EXPECT_FIND_("TRACE_EVENT_START0 call");
+  EXPECT_FIND_("TRACE_EVENT_ASYNC_BEGIN0 call");
   EXPECT_SUB_FIND_("id");
   EXPECT_SUB_FIND_("5");
-  EXPECT_FIND_("TRACE_EVENT_START1 call");
+  EXPECT_FIND_("TRACE_EVENT_ASYNC_BEGIN1 call");
   EXPECT_SUB_FIND_("id");
   EXPECT_SUB_FIND_("5");
   EXPECT_SUB_FIND_("name1");
   EXPECT_SUB_FIND_("value1");
-  EXPECT_FIND_("TRACE_EVENT_START2 call");
+  EXPECT_FIND_("TRACE_EVENT_ASYNC_BEGIN2 call");
   EXPECT_SUB_FIND_("id");
   EXPECT_SUB_FIND_("5");
   EXPECT_SUB_FIND_("name1");
@@ -456,15 +456,15 @@ void ValidateAllTraceMacrosCreatedData(const ListValue& trace_parsed) {
   EXPECT_SUB_FIND_("name2");
   EXPECT_SUB_FIND_("value2");
 
-  EXPECT_FIND_("TRACE_EVENT_FINISH0 call");
+  EXPECT_FIND_("TRACE_EVENT_ASYNC_END0 call");
   EXPECT_SUB_FIND_("id");
   EXPECT_SUB_FIND_("5");
-  EXPECT_FIND_("TRACE_EVENT_FINISH1 call");
+  EXPECT_FIND_("TRACE_EVENT_ASYNC_END1 call");
   EXPECT_SUB_FIND_("id");
   EXPECT_SUB_FIND_("5");
   EXPECT_SUB_FIND_("name1");
   EXPECT_SUB_FIND_("value1");
-  EXPECT_FIND_("TRACE_EVENT_FINISH2 call");
+  EXPECT_FIND_("TRACE_EVENT_ASYNC_END2 call");
   EXPECT_SUB_FIND_("id");
   EXPECT_SUB_FIND_("5");
   EXPECT_SUB_FIND_("name1");
@@ -923,10 +923,10 @@ TEST_F(TraceEventTestFixture, StartFinishEvents) {
   TraceLog::GetInstance()->SetEnabled(true);
 
   unsigned long long id = 0xfeedbeeffeedbeefull;
-  TRACE_EVENT_START0( "cat", "name1", id);
-  TRACE_EVENT_FINISH0("cat", "name1", id);
+  TRACE_EVENT_ASYNC_BEGIN0( "cat", "name1", id);
+  TRACE_EVENT_ASYNC_END0("cat", "name1", id);
   TRACE_EVENT_BEGIN0( "cat", "name2");
-  TRACE_EVENT_START0( "cat", "name3", 0);
+  TRACE_EVENT_ASYNC_BEGIN0( "cat", "name3", 0);
 
   TraceLog::GetInstance()->SetEnabled(false);
 
@@ -952,13 +952,13 @@ TEST_F(TraceEventTestFixture, StartFinishPointerMangling) {
 
   TraceLog::GetInstance()->SetProcessID(100);
   TraceLog::GetInstance()->SetEnabled(true);
-  TRACE_EVENT_START0( "cat", "name1", ptr);
-  TRACE_EVENT_START0( "cat", "name2", ptr);
+  TRACE_EVENT_ASYNC_BEGIN0( "cat", "name1", ptr);
+  TRACE_EVENT_ASYNC_BEGIN0( "cat", "name2", ptr);
   TraceLog::GetInstance()->SetEnabled(false);
 
   TraceLog::GetInstance()->SetProcessID(200);
   TraceLog::GetInstance()->SetEnabled(true);
-  TRACE_EVENT_FINISH0( "cat", "name1", ptr);
+  TRACE_EVENT_ASYNC_END0( "cat", "name1", ptr);
   TraceLog::GetInstance()->SetEnabled(false);
 
   DictionaryValue* start = FindNamePhase("name1", "S");