Revert of Unflake V8 sampling profiler tests.

content/renderer/devtools/v8_sampling_profiler.cc

Index: content/renderer/devtools/v8_sampling_profiler.cc
diff --git a/content/renderer/devtools/v8_sampling_profiler.cc b/content/renderer/devtools/v8_sampling_profiler.cc
index 9b3249745e27c070582e3c0858029e6222c04549..06d3104de50f933e635cbbcf0c9c1c6bc43ad4f8 100644
--- a/content/renderer/devtools/v8_sampling_profiler.cc
+++ b/content/renderer/devtools/v8_sampling_profiler.cc
@@ -117,16 +117,9 @@
 
   void DoSample(const v8::RegisterState& state);
 
-  void SetEventsToCollectForTest(int code_added_events, int sample_events) {
-    code_added_events_to_collect_for_test_ = code_added_events;
-    sample_events_to_collect_for_test_ = sample_events;
-  }
-
   bool EventsCollectedForTest() const {
-    return base::subtle::NoBarrier_Load(&code_added_events_count_) >=
-               code_added_events_to_collect_for_test_ &&
-           base::subtle::NoBarrier_Load(&samples_count_) >=
-               sample_events_to_collect_for_test_;
+    return base::subtle::NoBarrier_Load(&code_added_events_count_) != 0 ||
+           base::subtle::NoBarrier_Load(&samples_count_) != 0;
   }
 
  private:
@@ -149,8 +142,6 @@
   scoped_ptr<SamplingQueue> samples_data_;
   base::subtle::Atomic32 code_added_events_count_;
   base::subtle::Atomic32 samples_count_;
-  int code_added_events_to_collect_for_test_;
-  int sample_events_to_collect_for_test_;
 
   static base::LazyInstance<base::ThreadLocalPointer<Sampler>>::Leaky
       tls_instance_;
@@ -164,9 +155,7 @@
       thread_handle_(Sampler::GetCurrentThreadHandle()),
       isolate_(Isolate::GetCurrent()),
       code_added_events_count_(0),
-      samples_count_(0),
-      code_added_events_to_collect_for_test_(0),
-      sample_events_to_collect_for_test_(0) {
+      samples_count_(0) {
   DCHECK(isolate_);
   DCHECK(!GetInstance());
   tls_instance_.Pointer()->Set(this);
@@ -224,6 +213,7 @@
     return;
   record->Collect(isolate_, timestamp, state);
   samples_data_->FinishEnqueue();
+  base::subtle::NoBarrier_AtomicIncrement(&samples_count_, 1);
 }
 
 void Sampler::InjectPendingEvents() {
@@ -235,7 +225,6 @@
         record->ToTraceFormat());
     samples_data_->Remove();
     record = samples_data_->Peek();
-    base::subtle::NoBarrier_AtomicIncrement(&samples_count_, 1);
   }
 }
 
@@ -559,10 +548,7 @@
   sampling_thread_.reset();
 }
 
-void V8SamplingProfiler::EnableSamplingEventForTesting(int code_added_events,
-                                                       int sample_events) {
-  render_thread_sampler_->SetEventsToCollectForTest(code_added_events,
-                                                    sample_events);
+void V8SamplingProfiler::EnableSamplingEventForTesting() {
   waitable_event_for_testing_.reset(new base::WaitableEvent(false, false));
 }