Reenabled GPU trace_test and constrained enabled categories.

content/test/gpu/gpu_tests/trace_test.py

 # Copyright (c) 2015 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.
 from gpu_tests import gpu_test_base
 from gpu_tests import trace_test_expectations
 import page_sets
 
 from telemetry.page import page_test
 from telemetry.timeline import model as model_module
 from telemetry.timeline import tracing_config
@@ skipping 49 matching lines @@
           event.category == category_name):
         break
     else:
       raise page_test.Failure(self._FormatException(category_name))
 
   def CustomizeBrowserOptions(self, options):
     options.AppendExtraBrowserArgs('--enable-logging')
 
   def WillNavigateToPage(self, page, tab):
     config = tracing_config.TracingConfig()
+    config.chrome_trace_config.category_filter.AddExcludedCategory('*')
     for cat in TOPLEVEL_CATEGORIES:
       config.chrome_trace_config.category_filter.AddDisabledByDefault(
           cat)
     config.enable_chrome_trace = True
     tab.browser.platform.tracing_controller.StartTracing(config, 60)
 
   def _FormatException(self, category):
     return 'Trace markers for GPU category was not found: %s' % category
 
 
@@ skipping 38 matching lines @@
   """Tests GPU Device traces show up on devices that support it."""
   test = _DeviceTraceValidator
   name = 'DeviceTraceTest'
 
   @classmethod
   def Name(cls):
     return 'device_trace_test'
 
   def _CreateExpectations(self):
     return trace_test_expectations.DeviceTraceTestExpectations()