[heap] Scavenger: Move internal declarations into class

Bug: chromium:738865
Change-Id: I070982d8a4fe2595673ca727973ad8b723050c2f
Reviewed-on: https://chromium-review.googlesource.com/692255Reviewed-by: Ulan Degenbaev <ulan@chromium.org>
Commit-Queue: Michael Lippautz <mlippautz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#48238}

src/heap/heap.cc

@@ -1954,8 +1954,8 @@ void Heap::Scavenge() {
   const bool is_logging = IsLogging(isolate());
   const int num_scavenge_tasks = NumberOfScavengeTasks();
   OneshotBarrier barrier;
-  CopiedList copied_list(num_scavenge_tasks);
-  PromotionList promotion_list(num_scavenge_tasks);
+  Scavenger::CopiedList copied_list(num_scavenge_tasks);
+  Scavenger::PromotionList promotion_list(num_scavenge_tasks);
   for (int i = 0; i < num_scavenge_tasks; i++) {
     scavengers[i] =
         new Scavenger(this, is_logging, &copied_list, &promotion_list, i);

src/heap/scavenger.h

@@ -16,16 +16,15 @@ namespace internal {
 
 class OneshotBarrier;
 
-static const int kCopiedListSegmentSize = 256;
-static const int kPromotionListSegmentSize = 256;
-
-using AddressRange = std::pair<Address, Address>;
-using ObjectAndSize = std::pair<HeapObject*, int>;
-using CopiedList = Worklist<ObjectAndSize, kCopiedListSegmentSize>;
-using PromotionList = Worklist<ObjectAndSize, kPromotionListSegmentSize>;
-
 class Scavenger {
  public:
+  static const int kCopiedListSegmentSize = 256;
+  static const int kPromotionListSegmentSize = 256;
+
+  using ObjectAndSize = std::pair<HeapObject*, int>;
+  using CopiedList = Worklist<ObjectAndSize, kCopiedListSegmentSize>;
+  using PromotionList = Worklist<ObjectAndSize, kPromotionListSegmentSize>;
+
   Scavenger(Heap* heap, bool is_logging, CopiedList* copied_list,
             PromotionList* promotion_list, int task_id);