Add some TraceAnalyzer utility methods to simplify test code

chrome/test/gpu/gpu_feature_browsertest.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/command_line.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/stringprintf.h"
 #include "base/test/trace_event_analyzer.h"
@@ skipping 112 matching lines @@
     // Have to use a new tab for the blacklist to work.
     RunTest(url, NULL, true);
 
     ASSERT_TRUE(tracing::EndTracing(&trace_events_json_));
 
     analyzer_.reset(TraceAnalyzer::Create(trace_events_json_));
     analyzer_->AssociateBeginEndEvents();
     TraceEventVector events;
 
     if (expectations & EXPECT_NO_GPU_SWAP_BUFFERS) {
-      EXPECT_EQ(analyzer_->FindEvents(Query::EventName() ==
-                                      Query::String("SwapBuffers"), &events),
-                size_t(0));
+      EXPECT_EQ(analyzer_->FindEvents(Query::EventNameIs("SwapBuffers"),
+                                      &events), size_t(0));
     }
 
     // Check for swap buffers if expected:
     if (expectations & EXPECT_GPU_SWAP_BUFFERS) {
-      EXPECT_GT(analyzer_->FindEvents(Query::EventName() ==
-                                      Query::String("SwapBuffers"), &events),
-                size_t(0));
+      EXPECT_GT(analyzer_->FindEvents(Query::EventNameIs("SwapBuffers"),
+                                      &events), size_t(0));
     }
   }
 
   // Trigger a resize of the chrome window, and use tracing to wait for the
   // given |wait_event|.
   bool ResizeAndWait(const gfx::Rect& new_bounds,
                      const char* trace_categories,
                      const char* wait_category,
                      const char* wait_event) {
     if (!tracing::BeginTracingWithWatch(trace_categories, wait_category,
@@ skipping 255 matching lines @@
 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, RafNoDamage) {
   trace_categories_ = "-test_*";
   const FilePath url(FILE_PATH_LITERAL("feature_raf_no_damage.html"));
   RunTest(url, GpuResultFlags(0));
 
   if (!analyzer_.get())
     return;
 
   // Search for matching name on begin event or async_begin event (any begin).
   Query query_raf =
-      (Query::EventPhase() == Query::Phase(TRACE_EVENT_PHASE_BEGIN) ||
-       Query::EventPhase() == Query::Phase(TRACE_EVENT_PHASE_ASYNC_BEGIN)) &&
-      Query::EventName() == Query::String("___RafWithNoDamage___");
+      (Query::EventPhaseIs(TRACE_EVENT_PHASE_BEGIN) ||
+       Query::EventPhaseIs(TRACE_EVENT_PHASE_ASYNC_BEGIN)) &&
+      Query::EventNameIs("___RafWithNoDamage___");
   TraceEventVector events;
   size_t num_events = analyzer_->FindEvents(query_raf, &events);
 
   trace_analyzer::RateStats stats;
   trace_analyzer::RateStatsOptions stats_options;
   stats_options.trim_min = stats_options.trim_max = num_events / 10;
   EXPECT_TRUE(trace_analyzer::GetRateStats(events, &stats, &stats_options));
 
   LOG(INFO) << "Number of RAFs: " << num_events <<
       " Mean: " << stats.mean_us <<
@@ skipping 76 matching lines @@
               i, offsets[i], events[j]->GetKnownArgAsInt("width"),
               events[j]->GetKnownArgAsInt("height"), this_num_creates);
     }
   }
 
   EXPECT_EQ(surface_pixels_per_window_pixel, num_creates);
 }
 #endif
 
 }  // namespace anonymous