Category group support/Renamings.

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 29 matching lines @@
 using trace_analyzer::TraceEventVector;
 
 namespace {
 
 const char kSwapBuffersEvent[] = "SwapBuffers";
 const char kAcceleratedCanvasCreationEvent[] = "Canvas2DLayerBridgeCreation";
 const char kWebGLCreationEvent[] = "DrawingBufferCreation";
 
 class GpuFeatureTest : public InProcessBrowserTest {
  public:
-  GpuFeatureTest() : trace_categories_("test_gpu"), gpu_enabled_(false) {}
+  GpuFeatureTest() : category_patterns_("test_gpu"), gpu_enabled_(false) {}
 
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
     base::FilePath test_dir;
     ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_dir));
     gpu_test_dir_ = test_dir.AppendASCII("gpu");
   }
 
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     // Do not use mesa if real GPU is required.
     if (!command_line->HasSwitch(switches::kUseGpuInTests)) {
@@ skipping 56 matching lines @@
     // Bypass tests on GPU Linux Debug bots.
     if (gpu_enabled_)
       return;
 #endif
 #if defined(OS_MACOSX)
     // Bypass tests on Mac OSX 10.5 bots (IOSurfaceSupport is now required).
     if (!IOSurfaceSupport::Initialize())
       return;
 #endif
 
-    ASSERT_TRUE(tracing::BeginTracing(trace_categories_));
+    ASSERT_TRUE(tracing::BeginTracing(category_patterns_));
 
     // 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 (!event_name)
       return;
 
     size_t event_count =
         analyzer_->FindEvents(Query::EventNameIs(event_name), &events);
 
     if (event_expected)
       EXPECT_GT(event_count, 0U);
     else
       EXPECT_EQ(event_count, 0U);
   }
 
   // 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* category_patterns,
                      const char* wait_category,
                      const char* wait_event) {
-    if (!tracing::BeginTracingWithWatch(trace_categories, wait_category,
+    if (!tracing::BeginTracingWithWatch(category_patterns, wait_category,
                                         wait_event, 1))
       return false;
     browser()->window()->SetBounds(new_bounds);
     if (!tracing::WaitForWatchEvent(base::TimeDelta()))
       return false;
     if (!tracing::EndTracing(&trace_events_json_))
       return false;
     analyzer_.reset(TraceAnalyzer::Create(trace_events_json_));
     analyzer_->AssociateBeginEndEvents();
     return true;
   }
 
  protected:
   base::FilePath gpu_test_dir_;
   scoped_ptr<TraceAnalyzer> analyzer_;
-  std::string trace_categories_;
+  std::string category_patterns_;
   std::string trace_events_json_;
   bool gpu_enabled_;
 };
 
 #if defined(OS_WIN)
 // This test is flaky on Windows. http://crbug.com/177113
 #define MAYBE_AcceleratedCompositingAllowed DISABLED_AcceleratedCompositingAllowed
 #else
 #define MAYBE_AcceleratedCompositingAllowed AcceleratedCompositingAllowed
 #endif
@@ skipping 274 matching lines @@
 }
 
 
 #if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_MACOSX)
 // http://crbug.com/162343: flaky on Windows and Mac, failing on ChromiumOS.
 #define MAYBE_RafNoDamage DISABLED_RafNoDamage
 #else
 #define MAYBE_RafNoDamage RafNoDamage
 #endif
 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, MAYBE_RafNoDamage) {
-  trace_categories_ = "-test_*";
+  category_patterns_ = "-test_*";
   const base::FilePath url(FILE_PATH_LITERAL("feature_raf_no_damage.html"));
   RunEventTest(url);
 
   if (!analyzer_.get())
     return;
 
   // Search for matching name on begin event or async_begin event (any begin).
   Query query_raf =
       (Query::EventPhaseIs(TRACE_EVENT_PHASE_BEGIN) ||
        Query::EventPhaseIs(TRACE_EVENT_PHASE_ASYNC_BEGIN)) &&
@@ skipping 88 matching lines @@
           base::StringPrintf(
               "%d (resize offset %d): IOSurface width %d -> %d; Creates %d "
               "Expected %d", offset_i, offsets[offset_i],
               old_width, new_width, num_creates, expected_creates);
     }
   }
 }
 #endif
 
 }  // namespace anonymous