Revert to code state of 3.13.1 plus r12350

test/cctest/test-debug.cc

Index: test/cctest/test-debug.cc
diff --git a/test/cctest/test-debug.cc b/test/cctest/test-debug.cc
index 83cbbf30da404fb7938ecb4abe93bab2a2a63585..39d918d25e610a3ebc9df587907ca375638a8a35 100644
--- a/test/cctest/test-debug.cc
+++ b/test/cctest/test-debug.cc
@@ -7394,7 +7394,7 @@ TEST(Regress131642) {
 
 
 // Import from test-heap.cc
-int CountNativeContexts();
+int CountGlobalContexts();
 
 
 static void NopListener(v8::DebugEvent event,
@@ -7407,15 +7407,15 @@ static void NopListener(v8::DebugEvent event,
 TEST(DebuggerCreatesContextIffActive) {
   v8::HandleScope scope;
   DebugLocalContext env;
-  CHECK_EQ(1, CountNativeContexts());
+  CHECK_EQ(1, CountGlobalContexts());
 
   v8::Debug::SetDebugEventListener(NULL);
   CompileRun("debugger;");
-  CHECK_EQ(1, CountNativeContexts());
+  CHECK_EQ(1, CountGlobalContexts());
 
   v8::Debug::SetDebugEventListener(NopListener);
   CompileRun("debugger;");
-  CHECK_EQ(2, CountNativeContexts());
+  CHECK_EQ(2, CountGlobalContexts());
 
   v8::Debug::SetDebugEventListener(NULL);
 }