Add some TraceAnalyzer utility methods to simplify test code

base/test/trace_event_analyzer_unittest.cc

 // 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.
 
 #include "base/bind.h"
 #include "base/debug/trace_event_unittest.h"
 #include "base/test/trace_event_analyzer.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 110 matching lines @@
   other.category = "category2";
   other.name = "name2";
   other.id = "2";
   other.arg_numbers["num2"] = 8.0;
   other.arg_strings["str2"] = "the string 2";
 
   event.other_event = &other;
   ASSERT_TRUE(event.has_other_event());
   double duration = event.GetAbsTimeToOtherEvent();
 
-  Query event_pid = (Query::EventPid() == Query::Int(event.thread.process_id));
-  Query event_tid = (Query::EventTid() == Query::Int(event.thread.thread_id));
-  Query event_time = (Query::EventTime() == Query::Double(event.timestamp));
-  Query event_duration = (Query::EventDuration() == Query::Double(duration));
-  Query event_phase = (Query::EventPhase() == Query::Phase(event.phase));
-  Query event_category =
-      (Query::EventCategory() == Query::String(event.category));
-  Query event_name = (Query::EventName() == Query::String(event.name));
-  Query event_id = (Query::EventId() == Query::String(event.id));
+  Query event_pid = Query::EventPidIs(event.thread.process_id);
+  Query event_tid = Query::EventTidIs(event.thread.thread_id);
+  Query event_time = Query::EventTimeIs(event.timestamp);
+  Query event_duration = Query::EventDurationIs(duration);
+  Query event_phase = Query::EventPhaseIs(event.phase);
+  Query event_category = Query::EventCategoryIs(event.category);
+  Query event_name = Query::EventNameIs(event.name);
+  Query event_id = Query::EventIdIs(event.id);
   Query event_has_arg1 = Query::EventHasNumberArg("num");
   Query event_has_arg2 = Query::EventHasStringArg("str");
   Query event_arg1 =
       (Query::EventArg("num") == Query::Double(event.arg_numbers["num"]));
   Query event_arg2 =
       (Query::EventArg("str") == Query::String(event.arg_strings["str"]));
   Query event_has_other = Query::EventHasOther();
-  Query other_pid = (Query::OtherPid() == Query::Int(other.thread.process_id));
-  Query other_tid = (Query::OtherTid() == Query::Int(other.thread.thread_id));
-  Query other_time = (Query::OtherTime() == Query::Double(other.timestamp));
-  Query other_phase = (Query::OtherPhase() == Query::Phase(other.phase));
-  Query other_category =
-      (Query::OtherCategory() == Query::String(other.category));
-  Query other_name = (Query::OtherName() == Query::String(other.name));
-  Query other_id = (Query::OtherId() == Query::String(other.id));
+  Query other_pid = Query::OtherPidIs(other.thread.process_id);
+  Query other_tid = Query::OtherTidIs(other.thread.thread_id);
+  Query other_time = Query::OtherTimeIs(other.timestamp);
+  Query other_phase = Query::OtherPhaseIs(other.phase);
+  Query other_category = Query::OtherCategoryIs(other.category);
+  Query other_name = Query::OtherNameIs(other.name);
+  Query other_id = Query::OtherIdIs(other.id);
   Query other_has_arg1 = Query::OtherHasNumberArg("num2");
   Query other_has_arg2 = Query::OtherHasStringArg("str2");
   Query other_arg1 =
       (Query::OtherArg("num2") == Query::Double(other.arg_numbers["num2"]));
   Query other_arg2 =
       (Query::OtherArg("str2") == Query::String(other.arg_strings["str2"]));
 
   EXPECT_TRUE(event_pid.Evaluate(event));
   EXPECT_TRUE(event_tid.Evaluate(event));
   EXPECT_TRUE(event_time.Evaluate(event));
@@ skipping 653 matching lines @@
   EXPECT_EQ(num_events, CountMatches(event_ptrs, Query::Bool(true)));
   EXPECT_EQ(num_events - 1, CountMatches(event_ptrs, Query::Bool(true),
                                          1, num_events));
   EXPECT_EQ(1u, CountMatches(event_ptrs, query_one));
   EXPECT_EQ(num_events - 1, CountMatches(event_ptrs, !query_one));
   EXPECT_EQ(num_named, CountMatches(event_ptrs, query_named));
 }
 
 
 }  // namespace trace_analyzer