Get rid of distinction between below- and above-watermark in page allocation....

test/cctest/test-heap-profiler.cc

Index: test/cctest/test-heap-profiler.cc
===================================================================
--- test/cctest/test-heap-profiler.cc	(revision 7216)
+++ test/cctest/test-heap-profiler.cc	(working copy)
@@ -59,9 +59,9 @@
       "var f2 = new F();\n");
 
   ConstructorHeapProfileTestHelper cons_profile;
+  i::HeapIterator iterator;
   i::AssertNoAllocation no_alloc;
-  i::HeapIterator iterator;
-  for (i::HeapObject* obj = iterator.next(); obj != NULL; obj = iterator.next())
+  for (i::HeapObject* obj = iterator.Next(); obj != NULL; obj = iterator.Next())
     cons_profile.CollectStats(obj);
   CHECK_EQ(0, cons_profile.f_count());
   cons_profile.PrintStats();
@@ -363,9 +363,9 @@
       "var c = new C(a);");
 
   RetainerHeapProfile ret_profile;
+  i::HeapIterator iterator;
   i::AssertNoAllocation no_alloc;
-  i::HeapIterator iterator;
-  for (i::HeapObject* obj = iterator.next(); obj != NULL; obj = iterator.next())
+  for (i::HeapObject* obj = iterator.Next(); obj != NULL; obj = iterator.Next())
     ret_profile.CollectStats(obj);
   ret_profile.CoarseAndAggregate();
   RetainerProfilePrinter printer;
@@ -730,7 +730,7 @@
   const v8::HeapSnapshot* snapshot1 =
       v8::HeapProfiler::TakeSnapshot(v8::String::New("s1"));
 
-  i::Heap::CollectAllGarbage(true);  // Enforce compaction.
+  i::Heap::CollectAllGarbage(i::Heap::kForceCompactionMask);
 
   const v8::HeapSnapshot* snapshot2 =
       v8::HeapProfiler::TakeSnapshot(v8::String::New("s2"));