Merge ObjectIterator::has_next and ObjectIterator::next methods....

test/cctest/test-heap-profiler.cc

 // Copyright 2009 the V8 project authors. All rights reserved.
 //
 // Tests for heap profiler
 
 #ifdef ENABLE_LOGGING_AND_PROFILING
 
 #include "v8.h"
 #include "heap-profiler.h"
 #include "string-stream.h"
 #include "cctest.h"
@@ skipping 46 matching lines @@
   env->Enter();
 
   CompileAndRunScript(
       "function F() {}  // A constructor\n"
       "var f1 = new F();\n"
       "var f2 = new F();\n");
 
   ConstructorHeapProfileTestHelper cons_profile;
   i::AssertNoAllocation no_alloc;
   i::HeapIterator iterator;
-  while (iterator.has_next()) {
-    i::HeapObject* 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();
   CHECK_EQ(2, cons_profile.f_count());
 }
 
 
 static JSObjectsCluster AddHeapObjectToTree(JSObjectsRetainerTree* tree,
                                             i::String* constructor,
                                             int instance,
                                             JSObjectsCluster* ref1 = NULL,
@@ skipping 287 matching lines @@
       "function A() {}\n"
       "function B(x) { this.x = x; }\n"
       "function C(x) { this.x1 = x; this.x2 = x; }\n"
       "var a = new A();\n"
       "var b1 = new B(a), b2 = new B(a);\n"
       "var c = new C(a);");
 
   RetainerHeapProfile ret_profile;
   i::AssertNoAllocation no_alloc;
   i::HeapIterator iterator;
-  while (iterator.has_next()) {
-    i::HeapObject* obj = iterator.next();
+  for (i::HeapObject* obj = iterator.next(); obj != NULL; obj = iterator.next())
     ret_profile.CollectStats(obj);
-  }
   RetainerProfilePrinter printer;
   ret_profile.DebugPrintStats(&printer);
   const char* retainers_of_a = printer.GetRetainers("A");
   // The order of retainers is unspecified, so we check string length, and
   // verify each retainer separately.
   CHECK_EQ(i::StrLength("(global property);1,B;2,C;2"),
            i::StrLength(retainers_of_a));
   CHECK(strstr(retainers_of_a, "(global property);1") != NULL);
   CHECK(strstr(retainers_of_a, "B;2") != NULL);
   CHECK(strstr(retainers_of_a, "C;2") != NULL);
   CHECK_EQ("(global property);2", printer.GetRetainers("B"));
   CHECK_EQ("(global property);1", printer.GetRetainers("C"));
 }
 
 #endif  // ENABLE_LOGGING_AND_PROFILING