ABANDONED CL: Changes to compile and pass tests after Big Blink Rename (excluding functions).

third_party/WebKit/Source/platform/heap/ThreadState.cpp

Index: third_party/WebKit/Source/platform/heap/ThreadState.cpp
diff --git a/third_party/WebKit/Source/platform/heap/ThreadState.cpp b/third_party/WebKit/Source/platform/heap/ThreadState.cpp
index 53497e71765aa20f04d9c4cb0688c20de2592bc1..16311e2fd4798ea3e8987716f7a3a5de4ddfc8eb 100644
--- a/third_party/WebKit/Source/platform/heap/ThreadState.cpp
+++ b/third_party/WebKit/Source/platform/heap/ThreadState.cpp
@@ -1299,20 +1299,24 @@ void ThreadState::postSweep() {
     timeForSweepHistogram.count(m_accumulatedSweepingTime);
 
 #define COUNT_COLLECTION_RATE_HISTOGRAM_BY_GC_REASON(GCReason)              \
-  case BlinkGC::GCReason: {                                                 \
+  case BlinkGC::k##GCReason: {                                                 \
     DEFINE_STATIC_LOCAL(CustomCountHistogram, histogram,                    \
                         ("BlinkGC.CollectionRate_" #GCReason, 1, 100, 20)); \
     histogram.count(static_cast<int>(100 * collectionRate));                \
     break;                                                                  \
   }
 
-    switch (m_heap->lastGCReason()) {
+    switch (heap_->lastGCReason()) {
+      /* DO NOT SUBMIT - Conflict resolution helper:
+       * important to use IdleGC, rather than kIdleGC below - stringification */
       COUNT_COLLECTION_RATE_HISTOGRAM_BY_GC_REASON(IdleGC)
       COUNT_COLLECTION_RATE_HISTOGRAM_BY_GC_REASON(PreciseGC)
       COUNT_COLLECTION_RATE_HISTOGRAM_BY_GC_REASON(ConservativeGC)
       COUNT_COLLECTION_RATE_HISTOGRAM_BY_GC_REASON(ForcedGC)
       COUNT_COLLECTION_RATE_HISTOGRAM_BY_GC_REASON(MemoryPressureGC)
       COUNT_COLLECTION_RATE_HISTOGRAM_BY_GC_REASON(PageNavigationGC)
+      /* DO NOT SUBMIT - Conflict resolution helper:
+       * important to use IdleGC, rather than kIdleGC above - stringification */
       default:
         break;
     }
@@ -1641,11 +1645,11 @@ void ThreadState::takeSnapshot(SnapshotType type) {
     numberOfHeapsReported++;                                            \
     switch (type) {                                                     \
       case SnapshotType::HeapSnapshot:                                  \
-        m_arenas[BlinkGC::ArenaType##ArenaIndex]->takeSnapshot(         \
+        m_arenas[BlinkGC::k##ArenaType##ArenaIndex]->takeSnapshot(         \
             heapsDumpName + "/" #ArenaType, info);                      \
         break;                                                          \
       case SnapshotType::FreelistSnapshot:                              \
-        m_arenas[BlinkGC::ArenaType##ArenaIndex]->takeFreelistSnapshot( \
+        m_arenas[BlinkGC::k##ArenaType##ArenaIndex]->takeFreelistSnapshot( \
             heapsDumpName + "/" #ArenaType);                            \
         break;                                                          \
       default:                                                          \
@@ -1653,6 +1657,8 @@ void ThreadState::takeSnapshot(SnapshotType type) {
     }                                                                   \
   }
 
+  /* DO NOT SUBMIT - Conflict resolution helper:
+   * Important to use NormalPage instead of kNormalPage1 below */
   SNAPSHOT_HEAP(NormalPage1);
   SNAPSHOT_HEAP(NormalPage2);
   SNAPSHOT_HEAP(NormalPage3);
@@ -1665,6 +1671,8 @@ void ThreadState::takeSnapshot(SnapshotType type) {
   SNAPSHOT_HEAP(InlineVector);
   SNAPSHOT_HEAP(HashTable);
   SNAPSHOT_HEAP(LargeObject);
+  /* DO NOT SUBMIT - Conflict resolution helper:
+   * Important to use LargeObject instead of kLargeObject above */
   FOR_EACH_TYPED_ARENA(SNAPSHOT_HEAP);
 
   ASSERT(numberOfHeapsReported == BlinkGC::NumberOfArenas);