Revert three commits due to cpu-profiler failures

test/cctest/libsampler/test-sampler.cc

 // Copyright 2016 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 // Tests of sampler functionalities.
 
 #include "src/libsampler/sampler.h"
 
 #include "src/base/platform/platform.h"
 #include "test/cctest/cctest.h"
 
@@ skipping 23 matching lines @@
  private:
   Sampler* sampler_;
 };
 
 
 class TestSampler : public Sampler {
  public:
   explicit TestSampler(Isolate* isolate) : Sampler(isolate) {}
 
   void SampleStack(const v8::RegisterState& regs) override {
-    void* frames[kMaxFramesCount];
+    void* frames[Sampler::kMaxFramesCount];
     SampleInfo sample_info;
-    isolate()->GetStackSample(regs, frames, kMaxFramesCount, &sample_info);
+    isolate()->GetStackSample(regs, reinterpret_cast<void**>(frames),
+                              Sampler::kMaxFramesCount, &sample_info);
     if (is_counting_samples_) {
       if (sample_info.vm_state == JS) ++js_sample_count_;
       if (sample_info.vm_state == EXTERNAL) ++external_sample_count_;
     }
   }
 };
 
 
 class TestApiCallbacks {
  public:
@@ skipping 74 matching lines @@
   CompileRun(sampler_test_source);
   v8::Local<v8::Function> function = GetFunction(env.local(), "start");
 
   int32_t repeat_count = 100;
   v8::Local<v8::Value> args[] = {v8::Integer::New(isolate, repeat_count)};
   RunSampler(env.local(), function, args, arraysize(args), 100, 100);
 }
 
 }  // namespace sampler
 }  // namespace v8