Make castv2 performance test work.

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"
 #include "base/strings/stringprintf.h"
@@ skipping 479 matching lines @@
     event_maps.push_back(std::make_pair(&onbuffer, "timestamp"));
     event_maps.push_back(std::make_pair(&sink, "time_delta"));
     event_maps.push_back(std::make_pair(&inserted, "timestamp"));
     event_maps.push_back(std::make_pair(&encoded, "rtp_timestamp"));
     event_maps.push_back(std::make_pair(&transmitted, "rtp_timestamp"));
     event_maps.push_back(std::make_pair(&decoded, "rtp_timestamp"));
     event_maps.push_back(std::make_pair(&done, "render_time"));
 
     trace_analyzer::TraceEventVector capture_events;
     GetTraceEvents(analyzer, "Capture" , &capture_events);
+    EXPECT_GT(capture_events.size(), 0UL);
     std::vector<std::vector<double> > traced_frames;
     for (size_t i = kSkipEvents; i < capture_events.size(); i++) {
       std::vector<double> times;
       const trace_analyzer::TraceEvent *event = capture_events[i];
       times.push_back(event->timestamp);  // begin capture
       event = event->other_event;
       if (!event) {
         continue;
       }
       times.push_back(event->timestamp);  // end capture (with timestamp)
@@ skipping 93 matching lines @@
             proxy_end_point,
             receiver_end_point,
             media::cast::test::BadNetwork().Pass(),
             media::cast::test::BadNetwork().Pass(),
             NULL);
       }
       receiver_end_point = proxy_end_point;
     }
 
     std::string json_events;
-    ASSERT_TRUE(tracing::BeginTracing("test_fps,mirroring,cast_perf_test"));
+    ASSERT_TRUE(tracing::BeginTracing(
+        "test_fps,mirroring,gpu.capture,cast_perf_test"));
     const std::string page_url = base::StringPrintf(
         "performance%d.html?port=%d",
         getfps(),
         receiver_end_point.port());
     ASSERT_TRUE(RunExtensionSubtest("cast_streaming", page_url)) << message_;
     ASSERT_TRUE(tracing::EndTracing(&json_events));
     receiver->Stop();
 
     // 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(),
-        TRACE_DISABLED_BY_DEFAULT("OnSwapCompositorFrame"));
+        "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));