callback handler map not correctly populated by direct use of SetCallHandler

test/cctest/test-api.cc

Index: test/cctest/test-api.cc
diff --git a/test/cctest/test-api.cc b/test/cctest/test-api.cc
index c8f67de0abfc857747de6893320715eab7601cd1..a1ca013a32a5c0f8cc5b32272fd99e91d0b558b4 100644
--- a/test/cctest/test-api.cc
+++ b/test/cctest/test-api.cc
@@ -40,6 +40,7 @@
 #include "v8.h"
 
 #include "api.h"
+#include "arguments.h"
 #include "isolate.h"
 #include "compilation-cache.h"
 #include "execution.h"
@@ -908,6 +909,12 @@ static void TestFunctionTemplateInitializer(Handler handler) {
       CHECK_EQ(102, script->Run()->Int32Value());
     }
   }
+  // Blow away handler database
+  i::Isolate* isolate = i::Isolate::Current();
+  if (isolate->callback_table() != NULL) {
+    delete isolate->callback_table();
+    isolate->set_callback_table(NULL);
+  }
   // Use SetCallHandler to initialize a function template, should work like the
   // previous one.
   {