Cast: Make performance test work again

chrome/browser/extensions/api/cast_streaming/performance_test.cc

 // Copyright 2014 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 <map>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #if defined(OS_MACOSX)
@@ skipping 616 matching lines @@
 
     // Stop all threads, removes the need for synchronization when analyzing
     // the data.
     cast_environment->Shutdown();
     scoped_ptr<trace_analyzer::TraceAnalyzer> analyzer;
     analyzer.reset(trace_analyzer::TraceAnalyzer::Create(json_events));
     analyzer->AssociateAsyncBeginEndEvents();
 
     MeanAndError frame_data = AnalyzeTraceDistance(
         analyzer.get(),
-        "OnSwapCompositorFrame");
+        TRACE_DISABLED_BY_DEFAULT("OnSwapCompositorFrame"));
 
     EXPECT_GT(frame_data.num_values, 0UL);
     // Lower is better.
     frame_data.Print(test_name,
                      GetSuffixForTestFlags(),
                      "time_between_frames",
                      "ms");
 
     // This prints out the average time between capture events.
     // As the capture frame rate is capped at 30fps, this score
@@ skipping 24 matching lines @@
     CastV2PerformanceTest,
     testing::Values(
         kUseGpu | k24fps,
         kUseGpu | k30fps,
         kUseGpu | k60fps,
         kUseGpu | k24fps | kDisableVsync,
         kUseGpu | k30fps | kProxyWifi,
         kUseGpu | k30fps | kProxyBad,
         kUseGpu | k30fps | kSlowClock,
         kUseGpu | k30fps | kFastClock));