Remove unsafe access hacks from ScopedPersistent.

chrome/renderer/extensions/activity_log_converter_strategy_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "chrome/renderer/extensions/activity_log_converter_strategy.h"
 #include "chrome/renderer/extensions/scoped_persistent.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "v8/include/v8.h"
 
 using content::V8ValueConverter;
 
 namespace extensions {
 
 class ActivityLogConverterStrategyTest : public testing::Test {
  public:
   ActivityLogConverterStrategyTest()
       : isolate_(v8::Isolate::GetCurrent())
       , handle_scope_(isolate_)
       , context_(v8::Context::New(isolate_))
-      , context_scope_(context_.get()) {
+      , context_scope_(context_.NewHandle(isolate_)) {
   }
 
  protected:
   virtual void SetUp() {
     converter_.reset(V8ValueConverter::create());
     strategy_.reset(new ActivityLogConverterStrategy());
     converter_->SetFunctionAllowed(true);
     converter_->SetStrategy(strategy_.get());
   }
 
   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_handle()" to shorten these calls?

[marja, 2013/09/09 18:16:18]

Done (though, I noticed there is also isolate_ so this function is now shorter).

     if (value->IsType(base::Value::TYPE_NULL))
       return testing::AssertionSuccess();
     return testing::AssertionFailure();
   }
 
   testing::AssertionResult VerifyBoolean(v8::Local<v8::Value> v8_value,
                                          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)
       return testing::AssertionSuccess();
     return testing::AssertionFailure();
   }
 
   testing::AssertionResult VerifyInteger(v8::Local<v8::Value> v8_value,
                                          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)
       return testing::AssertionSuccess();
     return testing::AssertionFailure();
   }
 
   testing::AssertionResult VerifyDouble(v8::Local<v8::Value> v8_value,
                                         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)
       return testing::AssertionSuccess();
     return testing::AssertionFailure();
   }
 
   testing::AssertionResult VerifyString(v8::Local<v8::Value> v8_value,
                                         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)
       return testing::AssertionSuccess();
     return testing::AssertionFailure();
   }
 
   v8::Isolate* isolate_;
   v8::HandleScope handle_scope_;
   ScopedPersistent<v8::Context> context_;
@@ skipping 56 matching lines @@
                            "[Array]"));
   EXPECT_TRUE(VerifyString(v8_object->Get(v8::String::New("empty_list")),
                            "[Array]"));
   EXPECT_TRUE(VerifyString(v8_object->Get(v8::String::New("function")),
                            "[Function]"));
   EXPECT_TRUE(VerifyString(v8_object->Get(v8::String::New("named_function")),
                            "[Function foo()]"));
 }
 
 }  // namespace extensions
-