[cpu-profiler] Clean up includes

Change-Id: I25618b4516fe90eb563bd6b02a8ff1c5081d8f15
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2165731
Reviewed-by: Sigurd Schneider <sigurds@chromium.org>
Commit-Queue: Peter Marshall <petermarshall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#67389}

src/profiler/cpu-profiler.cc

@@ -12,6 +12,7 @@
 #include "src/debug/debug.h"
 #include "src/execution/frames-inl.h"
 #include "src/execution/vm-state-inl.h"
+#include "src/libsampler/sampler.h"
 #include "src/logging/counters.h"
 #include "src/logging/log.h"
 #include "src/profiler/cpu-profiler-inl.h"

src/profiler/cpu-profiler.h

@@ -12,23 +12,22 @@
 #include "src/base/platform/condition-variable.h"
 #include "src/base/platform/mutex.h"
 #include "src/base/platform/time.h"
-#include "src/execution/isolate.h"
-#include "src/handles/maybe-handles.h"
-#include "src/libsampler/sampler.h"
 #include "src/profiler/circular-queue.h"
 #include "src/profiler/profiler-listener.h"
 #include "src/profiler/tick-sample.h"
-#include "src/utils/allocation.h"
 #include "src/utils/locked-queue.h"
 
 namespace v8 {
+namespace sampler {
+class Sampler;
+}
 namespace internal {
 
 // Forward declarations.
 class CodeEntry;
 class CodeMap;
-class CpuProfile;
 class CpuProfilesCollection;
+class Isolate;
 class ProfileGenerator;
 
 #define CODE_EVENTS_TYPE_LIST(V)                 \
@@ -192,6 +191,7 @@ class V8_EXPORT_PRIVATE ProfilerEventsProcessor : public base::Thread,
 
   ProfileGenerator* generator_;
   ProfilerCodeObserver* code_observer_;
+  // TODO(petermarshall): Use std::atomic and remove imports.
   base::Atomic32 running_;
   base::ConditionVariable running_cond_;
   base::Mutex running_mutex_;
@@ -337,7 +337,7 @@ class V8_EXPORT_PRIVATE CpuProfiler {
   ProfilerEventsProcessor* processor() const { return processor_.get(); }
   Isolate* isolate() const { return isolate_; }
 
-  ProfilerListener* profiler_listener_for_test() {
+  ProfilerListener* profiler_listener_for_test() const {
     return profiler_listener_.get();
   }
 

src/profiler/profile-generator.cc

@@ -6,6 +6,7 @@
 
 #include <algorithm>
 
+#include "src/codegen/source-position.h"
 #include "src/objects/shared-function-info-inl.h"
 #include "src/profiler/cpu-profiler.h"
 #include "src/profiler/profile-generator-inl.h"

src/profiler/profile-generator.h

@@ -17,7 +17,6 @@
 #include "include/v8-profiler.h"
 #include "src/base/platform/time.h"
 #include "src/builtins/builtins.h"
-#include "src/codegen/source-position.h"
 #include "src/logging/code-events.h"
 #include "src/profiler/strings-storage.h"
 #include "src/utils/allocation.h"

src/profiler/tracing-cpu-profiler.cc

@@ -4,6 +4,7 @@
 
 #include "src/profiler/tracing-cpu-profiler.h"
 
+#include "src/execution/isolate.h"
 #include "src/init/v8.h"
 #include "src/profiler/cpu-profiler.h"
 #include "src/tracing/trace-event.h"

test/cctest/test-cpu-profiler.cc

@@ -39,6 +39,7 @@
 #include "src/deoptimizer/deoptimizer.h"
 #include "src/heap/spaces.h"
 #include "src/libplatform/default-platform.h"
+#include "src/libsampler/sampler.h"
 #include "src/logging/log.h"
 #include "src/objects/objects-inl.h"
 #include "src/profiler/cpu-profiler-inl.h"