Revert to code state of 3.13.1 plus r12350

test/cctest/test-heap-profiler.cc

 // Copyright 2011 the V8 project authors. All rights reserved.
 //
 // Tests for heap profiler
 
 #include <ctype.h>
 
 #include "v8.h"
 
 #include "cctest.h"
 #include "hashmap.h"
@@ skipping 1503 matching lines @@
   CHECK(!HasWeakGlobalHandle());
 
   v8::Persistent<v8::Object> handle =
       v8::Persistent<v8::Object>::New(v8::Object::New());
   handle.MakeWeak(NULL, PersistentHandleCallback);
 
   CHECK(HasWeakGlobalHandle());
 }
 
 
-TEST(WeakNativeContextRefs) {
+TEST(WeakGlobalContextRefs) {
   v8::HandleScope scope;
   LocalContext env;
 
   const v8::HeapSnapshot* snapshot =
       v8::HeapProfiler::TakeSnapshot(v8_str("weaks"));
   const v8::HeapGraphNode* gc_roots = GetNode(
       snapshot->GetRoot(), v8::HeapGraphNode::kObject, "(GC roots)");
   CHECK_NE(NULL, gc_roots);
   const v8::HeapGraphNode* global_handles = GetNode(
       gc_roots, v8::HeapGraphNode::kObject, "(Global handles)");
   CHECK_NE(NULL, global_handles);
-  const v8::HeapGraphNode* native_context = GetNode(
-      global_handles, v8::HeapGraphNode::kHidden, "system / NativeContext");
-  CHECK_NE(NULL, native_context);
-  CHECK(HasWeakEdge(native_context));
+  const v8::HeapGraphNode* global_context = GetNode(
+      global_handles, v8::HeapGraphNode::kHidden, "system / GlobalContext");
+  CHECK_NE(NULL, global_context);
+  CHECK(HasWeakEdge(global_context));
 }
 
 
 TEST(SfiAndJsFunctionWeakRefs) {
   v8::HandleScope scope;
   LocalContext env;
 
   CompileRun(
       "fun = (function (x) { return function () { return x + 1; } })(1);");
   const v8::HeapSnapshot* snapshot =
@@ skipping 123 matching lines @@
   const v8::HeapGraphNode* map =
       GetProperty(global_object, v8::HeapGraphEdge::kInternal, "map");
   CHECK_NE(NULL, map);
   const v8::HeapGraphNode* descriptors =
       GetProperty(map, v8::HeapGraphEdge::kInternal, "descriptors");
   CHECK_NE(NULL, descriptors);
   const v8::HeapGraphNode* transitions =
       GetProperty(map, v8::HeapGraphEdge::kInternal, "transitions");
   CHECK_NE(NULL, transitions);
 }