Use V8 Maybe APIs in extensions/renderer

extensions/renderer/v8_schema_registry.cc

 // Copyright 2014 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 "extensions/renderer/v8_schema_registry.h"
 
 #include "base/logging.h"
 #include "base/values.h"
 #include "content/public/child/v8_value_converter.h"
 #include "extensions/common/extension_api.h"
 #include "extensions/renderer/object_backed_native_handler.h"
 #include "extensions/renderer/script_context.h"
+#include "extensions/renderer/v8_maybe_helpers.h"
 
 using content::V8ValueConverter;
 
 namespace extensions {
 
 namespace {
 
 class SchemaRegistryNativeHandler : public ObjectBackedNativeHandler {
  public:
   SchemaRegistryNativeHandler(V8SchemaRegistry* registry,
@@ skipping 35 matching lines @@
                         NULL,  // no effective extension
                         Feature::UNSPECIFIED_CONTEXT));
   return scoped_ptr<NativeHandler>(
       new SchemaRegistryNativeHandler(this, context.Pass()));
 }
 
 v8::Local<v8::Array> V8SchemaRegistry::GetSchemas(
     const std::vector<std::string>& apis) {
   v8::Isolate* isolate = v8::Isolate::GetCurrent();
   v8::EscapableHandleScope handle_scope(isolate);
-  v8::Context::Scope context_scope(GetOrCreateContext(isolate));
+  v8::Local<v8::Context> context = GetOrCreateContext(isolate);
+  v8::Context::Scope context_scope(context);
 
   v8::Local<v8::Array> v8_apis(v8::Array::New(isolate, apis.size()));
   size_t api_index = 0;
   for (std::vector<std::string>::const_iterator i = apis.begin();
        i != apis.end();
        ++i) {
-    v8_apis->Set(api_index++, GetSchema(*i));
+    SetProperty(context, v8_apis, api_index++, GetSchema(*i));
   }
   return handle_scope.Escape(v8_apis);
 }
 
 v8::Local<v8::Object> V8SchemaRegistry::GetSchema(const std::string& api) {
   if (schema_cache_ != NULL) {
     v8::Local<v8::Object> cached_schema = schema_cache_->Get(api);
     if (!cached_schema.IsEmpty()) {
       return cached_schema;
     }
@@ skipping 26 matching lines @@
   if (!context_holder_) {
     context_holder_.reset(new gin::ContextHolder(isolate));
     context_holder_->SetContext(v8::Context::New(isolate));
     schema_cache_.reset(new SchemaCache(isolate));
     return context_holder_->context();
   }
   return context_holder_->context();
 }
 
 }  // namespace extensions