Unflake V8 sampling profiler tests.

content/renderer/devtools/v8_sampling_profiler_browsertest.cc

 // Copyright (c) 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 "base/json/json_reader.h"
 #include "base/run_loop.h"
 #include "base/trace_event/trace_event.h"
 #include "content/public/test/render_view_test.h"
 #include "content/renderer/devtools/v8_sampling_profiler.h"
 
@@ skipping 59 matching lines @@
     while (root_list->GetSize()) {
       scoped_ptr<Value> item;
       root_list->Remove(0, &item);
       trace_parsed_.Append(item.release());
     }
 
     if (!has_more_events)
       flush_complete_event->Signal();
   }
 
-  void CollectTrace() {
+  void CollectTrace(int code_added_events, int sample_events) {
     TraceLog* trace_log = TraceLog::GetInstance();
-    sampling_profiler_->EnableSamplingEventForTesting();
+    sampling_profiler_->EnableSamplingEventForTesting(code_added_events,
+                                                      sample_events);
     trace_log->SetEnabled(
         CategoryFilter(TRACE_DISABLED_BY_DEFAULT("v8.cpu_profile")),
         TraceLog::RECORDING_MODE, TraceOptions());
     base::RunLoop().RunUntilIdle();
     KickV8();  // Make a call to V8 so it can invoke interrupt request
                // callbacks.
     base::RunLoop().RunUntilIdle();
     sampling_profiler_->WaitSamplingEventForTesting();
     trace_log->SetDisabled();
     SyncFlush(trace_log);
@@ skipping 29 matching lines @@
 // The SamplingEventForTesting is fired when the framework collected at
 // least one JitCodeAdded event and one sample event.
 
 #if defined(OS_WIN)
 #define MAYBE(x) DISABLED_##x
 #else
 #define MAYBE(x) x
 #endif
 
 TEST_F(V8SamplingProfilerTest, MAYBE(V8SamplingEventFired)) {
-  sampling_profiler_->EnableSamplingEventForTesting();
+  sampling_profiler_->EnableSamplingEventForTesting(0, 0);
   TraceLog::GetInstance()->SetEnabled(
       CategoryFilter(TRACE_DISABLED_BY_DEFAULT("v8.cpu_profile")),
       TraceLog::RECORDING_MODE, TraceOptions());
   base::RunLoop().RunUntilIdle();
   sampling_profiler_->WaitSamplingEventForTesting();
   TraceLog::GetInstance()->SetDisabled();
 }
 
 TEST_F(V8SamplingProfilerTest, MAYBE(V8SamplingJitCodeEventsCollected)) {
-  CollectTrace();
+  CollectTrace(1, 0);
   int jit_code_added_events_count = CountEvents("JitCodeAdded");
   CHECK_LT(0, jit_code_added_events_count);
   base::RunLoop().RunUntilIdle();
 }
 
 TEST_F(V8SamplingProfilerTest, MAYBE(V8SamplingSamplesCollected)) {
-  CollectTrace();
+  CollectTrace(0, 1);
   int sample_events_count = CountEvents("V8Sample");
   CHECK_LT(0, sample_events_count);
   base::RunLoop().RunUntilIdle();
 }
 
 }  // namespace content