Remove more calls to HandleScope default ctor.

chrome/renderer/extensions/chrome_v8_context.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.
 
 #include "chrome/renderer/extensions/chrome_v8_context.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_split.h"
 #include "base/values.h"
@@ skipping 16 matching lines @@
 namespace extensions {
 
 ChromeV8Context::ChromeV8Context(v8::Handle<v8::Context> v8_context,
                                  WebKit::WebFrame* web_frame,
                                  const Extension* extension,
                                  Feature::Context context_type)
     : v8_context_(v8_context),
       web_frame_(web_frame),
       extension_(extension),
       context_type_(context_type),
-      safe_builtins_(this) {
+      safe_builtins_(this),
+      isolate_(v8_context->GetIsolate()) {
   VLOG(1) << "Created context:\n"
           << "  extension id: " << GetExtensionID() << "\n"
           << "  frame:        " << web_frame_ << "\n"
           << "  context type: " << GetContextTypeDescription();
 }
 
 ChromeV8Context::~ChromeV8Context() {
   VLOG(1) << "Destroyed context for extension\n"
           << "  extension id: " << GetExtensionID();
   Invalidate();
@@ skipping 21 matching lines @@
 
 GURL ChromeV8Context::GetURL() const {
   return web_frame_ ?
       UserScriptSlave::GetDataSourceURLForFrame(web_frame_) : GURL();
 }
 
 v8::Local<v8::Value> ChromeV8Context::CallFunction(
     v8::Handle<v8::Function> function,
     int argc,
     v8::Handle<v8::Value> argv[]) const {
-  v8::HandleScope handle_scope;
+  v8::HandleScope handle_scope(isolate());
   v8::Context::Scope scope(v8_context());
 
   WebKit::WebScopedMicrotaskSuppression suppression;
   if (!is_valid())
     return handle_scope.Close(v8::Undefined());
 
   v8::Handle<v8::Object> global = v8_context()->Global();
   if (!web_frame_)
     return handle_scope.Close(function->Call(global, argc, argv));
   return handle_scope.Close(
@@ skipping 38 matching lines @@
 
 ChromeV8Context* ChromeV8Context::GetContext() {
   return this;
 }
 
 void ChromeV8Context::OnResponseReceived(const std::string& name,
                                          int request_id,
                                          bool success,
                                          const base::ListValue& response,
                                          const std::string& error) {
-  v8::HandleScope handle_scope;
+  v8::HandleScope handle_scope(isolate());
 
   scoped_ptr<V8ValueConverter> converter(V8ValueConverter::create());
   v8::Handle<v8::Value> argv[] = {
     v8::Integer::New(request_id),
     v8::String::New(name.c_str()),
     v8::Boolean::New(success),
     converter->ToV8Value(&response, v8_context_.get()),
     v8::String::New(error.c_str())
   };
 
   v8::Handle<v8::Value> retval = module_system_->CallModuleMethod(
       "sendRequest", "handleResponse", arraysize(argv), argv);
 
   // In debug, the js will validate the callback parameters and return a
   // string if a validation error has occured.
   if (DCHECK_IS_ON()) {
     if (!retval.IsEmpty() && !retval->IsUndefined()) {
       std::string error = *v8::String::AsciiValue(retval);
       DCHECK(false) << error;
     }
   }
 }
 
 }  // namespace extensions