Fix HeapSnapshot test in the case when snapshotting is enabled.

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 "snapshot.h"
 #include "string-stream.h"
 #include "cctest.h"
 #include "zone-inl.h"
 #include "../include/v8-profiler.h"
 
 namespace i = v8::internal;
 using i::ClustersCoarser;
 using i::JSObjectsCluster;
 using i::JSObjectsRetainerTree;
 using i::JSObjectsClusterTree;
@@ skipping 431 matching lines @@
 
   CompileAndRunScript(
       "function A2() {}\n"
       "function B2(x) { return function() { return typeof x; }; }\n"
       "function C2(x) { this.x1 = x; this.x2 = x; this[1] = x; }\n"
       "var a2 = new A2();\n"
       "var b2_1 = new B2(a2), b2_2 = new B2(a2);\n"
       "var c2 = new C2(a2);");
   const v8::HeapSnapshot* snapshot_env2 =
       v8::HeapProfiler::TakeSnapshot(v8::String::New("env2"));
-  CHECK_EQ(1, snapshot_env2->GetHead()->GetChildrenCount());
-  const v8::HeapGraphNode* global_env2 =
-      snapshot_env2->GetHead()->GetChild(0)->GetToNode();
+  const v8::HeapGraphNode* global_env2;
+  if (i::Snapshot::IsEnabled()) {
+    // In case if snapshots are enabled, there will present a
+    // vanilla deserealized global object, without properties
+    // added by the test code.
+    CHECK_EQ(2, snapshot_env2->GetHead()->GetChildrenCount());
+    // Choose the global object of a bigger size.
+    const v8::HeapGraphNode* node0 =
+        snapshot_env2->GetHead()->GetChild(0)->GetToNode();
+    const v8::HeapGraphNode* node1 =
+        snapshot_env2->GetHead()->GetChild(1)->GetToNode();
+    global_env2 = node0->GetTotalSize() > node1->GetTotalSize() ?
+        node0 : node1;
+  } else {
+    CHECK_EQ(1, snapshot_env2->GetHead()->GetChildrenCount());
+    global_env2 = snapshot_env2->GetHead()->GetChild(0)->GetToNode();
+  }
 
   // Verify, that JS global object of env2 doesn't have '..1'
   // properties, but has '..2' properties.
   bool has_a1 = false, has_b1_1 = false, has_b1_2 = false, has_c1 = false;
   bool has_a2 = false, has_b2_1 = false, has_b2_2 = false, has_c2 = false;
   // This will be needed further.
   const v8::HeapGraphNode* a2_node = NULL;
   for (int i = 0, count = global_env2->GetChildrenCount(); i < count; ++i) {
     const v8::HeapGraphEdge* prop = global_env2->GetChild(i);
     v8::String::AsciiValue prop_name(prop->GetName());
@@ skipping 71 matching lines @@
   }
   CHECK(has_global_obj_a2_ref);
   CHECK(has_c2_x1_ref);
   CHECK(has_c2_x2_ref);
   CHECK(has_c2_1_ref);
   CHECK(has_b2_1_x_ref);
   CHECK(has_b2_2_x_ref);
 }
 
 #endif  // ENABLE_LOGGING_AND_PROFILING