Ported patch from revision 3839 to trunk.

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 e0bcbc92cfabfcdace40f8c63937d20167879516..563ac9db3e91f518874d176b3a2e03044f219261 100644
--- a/test/cctest/test-api.cc
+++ b/test/cctest/test-api.cc
@@ -4195,7 +4195,7 @@ THREADED_TEST(NativeFunctionDeclaration) {
 
 THREADED_TEST(NativeFunctionDeclarationError) {
   v8::HandleScope handle_scope;
-  const char* name = "nativedecl";
+  const char* name = "nativedeclerr";
   // Syntax error in extension code.
   v8::RegisterExtension(new NativeFunctionExtension(name,
                                                     "native\nfunction foo();"));
@@ -4207,7 +4207,7 @@ THREADED_TEST(NativeFunctionDeclarationError) {
 
 THREADED_TEST(NativeFunctionDeclarationErrorEscape) {
   v8::HandleScope handle_scope;
-  const char* name = "nativedecl";
+  const char* name = "nativedeclerresc";
   // Syntax error in extension code - escape code in "native" means that
   // it's not treated as a keyword.
   v8::RegisterExtension(new NativeFunctionExtension(