Chromium Code Reviews| Index: chrome/renderer/extensions/activity_log_converter_strategy_unittest.cc |
| diff --git a/chrome/renderer/extensions/activity_log_converter_strategy_unittest.cc b/chrome/renderer/extensions/activity_log_converter_strategy_unittest.cc |
| index b113d7a6505baaedaf6031fc73ddca86dc293f40..57811aac74250ef4ad13766ca395116231f53892 100644 |
| --- a/chrome/renderer/extensions/activity_log_converter_strategy_unittest.cc |
| +++ b/chrome/renderer/extensions/activity_log_converter_strategy_unittest.cc |
| @@ -19,7 +19,7 @@ class ActivityLogConverterStrategyTest : public testing::Test { |
| : isolate_(v8::Isolate::GetCurrent()) |
| , handle_scope_(isolate_) |
| , context_(v8::Context::New(isolate_)) |
| - , context_scope_(context_.get()) { |
| + , context_scope_(context_.NewHandle(isolate_)) { |
| } |
| protected: |
| @@ -32,7 +32,8 @@ class ActivityLogConverterStrategyTest : public testing::Test { |
| testing::AssertionResult VerifyNull(v8::Local<v8::Value> v8_value) { |
| scoped_ptr<base::Value> value( |
| - converter_->FromV8Value(v8_value, context_.get())); |
| + converter_->FromV8Value(v8_value, |
| + context_.NewHandle(v8::Isolate::GetCurrent()))); |
|
Jeffrey Yasskin
2013/09/09 17:45:07
Could you add a method "context()" or "context_han
marja
2013/09/09 18:16:18
Done (though, I noticed there is also isolate_ so
|
| if (value->IsType(base::Value::TYPE_NULL)) |
| return testing::AssertionSuccess(); |
| return testing::AssertionFailure(); |
| @@ -42,7 +43,8 @@ class ActivityLogConverterStrategyTest : public testing::Test { |
| bool expected) { |
| bool out; |
| scoped_ptr<base::Value> value( |
| - converter_->FromV8Value(v8_value, context_.get())); |
| + converter_->FromV8Value(v8_value, |
| + context_.NewHandle(v8::Isolate::GetCurrent()))); |
| if (value->IsType(base::Value::TYPE_BOOLEAN) |
| && value->GetAsBoolean(&out) |
| && out == expected) |
| @@ -54,7 +56,8 @@ class ActivityLogConverterStrategyTest : public testing::Test { |
| int expected) { |
| int out; |
| scoped_ptr<base::Value> value( |
| - converter_->FromV8Value(v8_value, context_.get())); |
| + converter_->FromV8Value(v8_value, |
| + context_.NewHandle(v8::Isolate::GetCurrent()))); |
| if (value->IsType(base::Value::TYPE_INTEGER) |
| && value->GetAsInteger(&out) |
| && out == expected) |
| @@ -66,7 +69,8 @@ class ActivityLogConverterStrategyTest : public testing::Test { |
| double expected) { |
| double out; |
| scoped_ptr<base::Value> value( |
| - converter_->FromV8Value(v8_value, context_.get())); |
| + converter_->FromV8Value(v8_value, |
| + context_.NewHandle(v8::Isolate::GetCurrent()))); |
| if (value->IsType(base::Value::TYPE_DOUBLE) |
| && value->GetAsDouble(&out) |
| && out == expected) |
| @@ -78,7 +82,8 @@ class ActivityLogConverterStrategyTest : public testing::Test { |
| const std::string& expected) { |
| std::string out; |
| scoped_ptr<base::Value> value( |
| - converter_->FromV8Value(v8_value, context_.get())); |
| + converter_->FromV8Value(v8_value, |
| + context_.NewHandle(v8::Isolate::GetCurrent()))); |
| if (value->IsType(base::Value::TYPE_STRING) |
| && value->GetAsString(&out) |
| && out == expected) |
| @@ -155,4 +160,3 @@ TEST_F(ActivityLogConverterStrategyTest, ConversionTest) { |
| } |
| } // namespace extensions |
| - |