Index: extensions/renderer/activity_log_converter_strategy.cc |
diff --git a/extensions/renderer/activity_log_converter_strategy.cc b/extensions/renderer/activity_log_converter_strategy.cc |
index 3a8d612405562bbde78158a737b0fffc92ceed09..13b0ad17acb0a084426f248e8f26967f613a2436 100644 |
--- a/extensions/renderer/activity_log_converter_strategy.cc |
+++ b/extensions/renderer/activity_log_converter_strategy.cc |
@@ -6,6 +6,7 @@ |
#include "base/logging.h" |
#include "base/values.h" |
+#include "extensions/renderer/v8_maybe_helpers.h" |
#include "v8/include/v8.h" |
namespace extensions { |
@@ -17,24 +18,24 @@ namespace { |
// "[HTMLElement]"). |
scoped_ptr<base::Value> SummarizeV8Value(v8::Isolate* isolate, |
v8::Local<v8::Object> object) { |
- v8::TryCatch try_catch; |
+ v8::TryCatch try_catch(isolate); |
v8::Isolate::DisallowJavascriptExecutionScope scope( |
isolate, v8::Isolate::DisallowJavascriptExecutionScope::THROW_ON_FAILURE); |
- v8::Local<v8::String> name = v8::String::NewFromUtf8(isolate, "["); |
+ v8::Local<v8::String> name = ToV8String(isolate, "["); |
if (object->IsFunction()) { |
name = |
- v8::String::Concat(name, v8::String::NewFromUtf8(isolate, "Function")); |
+ v8::String::Concat(name, ToV8String(isolate, "Function")); |
v8::Local<v8::Value> fname = |
v8::Local<v8::Function>::Cast(object)->GetName(); |
if (fname->IsString() && v8::Local<v8::String>::Cast(fname)->Length()) { |
- name = v8::String::Concat(name, v8::String::NewFromUtf8(isolate, " ")); |
+ name = v8::String::Concat(name, ToV8String(isolate, " ")); |
name = v8::String::Concat(name, v8::Local<v8::String>::Cast(fname)); |
- name = v8::String::Concat(name, v8::String::NewFromUtf8(isolate, "()")); |
+ name = v8::String::Concat(name, ToV8String(isolate, "()")); |
} |
} else { |
name = v8::String::Concat(name, object->GetConstructorName()); |
} |
- name = v8::String::Concat(name, v8::String::NewFromUtf8(isolate, "]")); |
+ name = v8::String::Concat(name, ToV8String(isolate, "]")); |
if (try_catch.HasCaught()) { |
return scoped_ptr<base::Value>( |