Merge bleeding_edge 17696:18016.

test/cctest/test-log-stack-tracer.cc

Index: test/cctest/test-log-stack-tracer.cc
diff --git a/test/cctest/test-log-stack-tracer.cc b/test/cctest/test-log-stack-tracer.cc
index 4a0717d09d556d23d7f64f6914ae8c8cd56a9afa..85fdf459924b387b4e06082b82aaedbbb3dbd8ba 100644
--- a/test/cctest/test-log-stack-tracer.cc
+++ b/test/cctest/test-log-stack-tracer.cc
@@ -113,13 +113,16 @@ const char* TraceExtension::kSource =
 
 v8::Handle<v8::FunctionTemplate> TraceExtension::GetNativeFunction(
     v8::Handle<String> name) {
-  if (name->Equals(String::New("trace"))) {
+  if (name->Equals(String::NewFromUtf8(v8::Isolate::GetCurrent(), "trace"))) {
     return v8::FunctionTemplate::New(TraceExtension::Trace);
-  } else if (name->Equals(String::New("js_trace"))) {
+  } else if (name->Equals(
+                 String::NewFromUtf8(v8::Isolate::GetCurrent(), "js_trace"))) {
     return v8::FunctionTemplate::New(TraceExtension::JSTrace);
-  } else if (name->Equals(String::New("js_entry_sp"))) {
+  } else if (name->Equals(String::NewFromUtf8(v8::Isolate::GetCurrent(),
+                                              "js_entry_sp"))) {
     return v8::FunctionTemplate::New(TraceExtension::JSEntrySP);
-  } else if (name->Equals(String::New("js_entry_sp_level2"))) {
+  } else if (name->Equals(String::NewFromUtf8(v8::Isolate::GetCurrent(),
+                                              "js_entry_sp_level2"))) {
     return v8::FunctionTemplate::New(TraceExtension::JSEntrySPLevel2);
   } else {
     CHECK(false);