Remove unsafe access hacks from ScopedPersistent.

chrome/renderer/extensions/object_backed_native_handler.cc

 // Copyright (c) 2012 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.
 
 // TODO(dcarney): Remove this when UnsafePersistent is removed.
 #define V8_ALLOW_ACCESS_TO_RAW_HANDLE_CONSTRUCTOR
 
 #include "chrome/renderer/extensions/object_backed_native_handler.h"
 
 #include "base/logging.h"
@@ skipping 14 matching lines @@
     ChromeV8Context* context)
     : context_(context),
       object_template_(v8::ObjectTemplate::New()) {
 }
 
 ObjectBackedNativeHandler::~ObjectBackedNativeHandler() {
   Invalidate();
 }
 
 v8::Handle<v8::Object> ObjectBackedNativeHandler::NewInstance() {
-  return object_template_->NewInstance();
+  return object_template_.NewHandle(v8::Isolate::GetCurrent())->NewInstance();
 }
 
 // static
 void ObjectBackedNativeHandler::Router(
     const v8::FunctionCallbackInfo<v8::Value>& args) {
   v8::HandleScope handle_scope(args.GetIsolate());
   v8::Handle<v8::Object> data = args.Data().As<v8::Object>();
 
   v8::Handle<v8::Value> handler_function_value =
       data->Get(v8::String::New(kHandlerFunction));
@@ skipping 15 matching lines @@
   v8::Isolate* isolate = v8::Isolate::GetCurrent();
   v8::HandleScope handle_scope(isolate);
   v8::Context::Scope context_scope(context_->v8_context());
 
   v8::Persistent<v8::Object> data(isolate, v8::Object::New());
   v8::Local<v8::Object> local_data = v8::Local<v8::Object>::New(isolate, data);
   local_data->Set(v8::String::New(kHandlerFunction),
                   v8::External::New(new HandlerFunction(handler_function)));
   v8::Handle<v8::FunctionTemplate> function_template =
       v8::FunctionTemplate::New(Router, local_data);
-  object_template_->Set(name.c_str(), function_template);
+  object_template_.NewHandle(isolate)->Set(name.c_str(), function_template);
   router_data_.push_back(UnsafePersistent<v8::Object>(&data));
 }
 
 void ObjectBackedNativeHandler::Invalidate() {
   if (!is_valid())
     return;
   v8::Isolate* isolate = v8::Isolate::GetCurrent();
   v8::HandleScope handle_scope(isolate);
   v8::Context::Scope context_scope(context_->v8_context());
 
   for (RouterData::iterator it = router_data_.begin();
        it != router_data_.end(); ++it) {
     v8::Handle<v8::Object> data = it->newLocal(isolate);
     v8::Handle<v8::Value> handler_function_value =
         data->Get(v8::String::New(kHandlerFunction));
     CHECK(!handler_function_value.IsEmpty());
     delete static_cast<HandlerFunction*>(
         handler_function_value.As<v8::External>()->Value());
     data->Delete(v8::String::New(kHandlerFunction));
     it->dispose();
   }
   object_template_.reset();
   context_ = NULL;
   NativeHandler::Invalidate();
 }
 
 }   // namespace extensions