Do not use (mostly) deprecated FunctionTemplate::New and Object::New functions.

R=jochen@chromium.org
BUG=324225

Review URL: https://codereview.chromium.org/119093004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241869 0039d316-1c4b-4281-b951-d872f2087c98

13 files changed, 42 insertions, 29 deletions

diff --git a/chrome/renderer/extensions/binding_generating_native_handler.cc b/chrome/renderer/extensions/binding_generating_native_handler.cc
index 6a4a351..f58cdb6 100644
--- a/chrome/renderer/extensions/binding_generating_native_handler.cc
+++ b/chrome/renderer/extensions/binding_generating_native_handler.cc
@@ -32,7 +32,7 @@ v8::Handle<v8::Object> BindingGeneratingNativeHandler::NewInstance() {
       create_binding->Call(binding, arraysize(argv), argv)->ToObject();
   v8::Handle<v8::Function> generate = binding_instance
       ->Get(v8::String::NewFromUtf8(isolate, "generate")).As<v8::Function>();
-  v8::Local<v8::Object> object = v8::Object::New();
+  v8::Local<v8::Object> object = v8::Object::New(isolate);
   v8::Handle<v8::Value> compiled_schema =
       generate->Call(binding_instance, 0, NULL);
   if (!compiled_schema.IsEmpty()) {
diff --git a/chrome/renderer/extensions/console.cc b/chrome/renderer/extensions/console.cc
index 5fe7df0..b2e4efc 100644
--- a/chrome/renderer/extensions/console.cc
+++ b/chrome/renderer/extensions/console.cc
@@ -177,7 +177,7 @@ void AddMessage(v8::Handle<v8::Context> context,
 v8::Local<v8::Object> AsV8Object() {
   v8::Isolate* isolate = v8::Isolate::GetCurrent();
   v8::EscapableHandleScope handle_scope(isolate);
-  v8::Local<v8::Object> console_object = v8::Object::New();
+  v8::Local<v8::Object> console_object = v8::Object::New(isolate);
   BindLogMethod(isolate, console_object, "debug", &Debug);
   BindLogMethod(isolate, console_object, "log", &Log);
   BindLogMethod(isolate, console_object, "warn", &Warn);
diff --git a/chrome/renderer/extensions/dispatcher.cc b/chrome/renderer/extensions/dispatcher.cc
index da0d23e..1fd4f39 100644
--- a/chrome/renderer/extensions/dispatcher.cc
+++ b/chrome/renderer/extensions/dispatcher.cc
@@ -136,7 +136,7 @@ v8::Handle<v8::Value> GetOrCreateChrome(ChromeV8Context* context) {
   v8::Handle<v8::Object> global(context->v8_context()->Global());
   v8::Handle<v8::Value> chrome(global->Get(chrome_string));
   if (chrome->IsUndefined()) {
-    chrome = v8::Object::New();
+    chrome = v8::Object::New(context->isolate());
     global->Set(chrome_string, chrome);
   }
   return chrome;
@@ -233,7 +233,7 @@ class V8ContextNativeHandler : public ObjectBackedNativeHandler {
     std::string api_name = *v8::String::Utf8Value(args[0]->ToString());
     Feature::Availability availability = context_->GetAvailability(api_name);
 
-    v8::Handle<v8::Object> ret = v8::Object::New();
+    v8::Handle<v8::Object> ret = v8::Object::New(isolate);
     ret->Set(v8::String::NewFromUtf8(isolate, "is_available"),
              v8::Boolean::New(isolate, availability.is_available()));
     ret->Set(v8::String::NewFromUtf8(isolate, "message"),
@@ -694,7 +694,7 @@ v8::Handle<v8::Object> Dispatcher::GetOrCreateObject(
     return v8::Handle<v8::Object>::Cast(value);
   }
 
-  v8::Handle<v8::Object> new_object = v8::Object::New();
+  v8::Handle<v8::Object> new_object = v8::Object::New(isolate);
   object->Set(key, new_object);
   return new_object;
 }
diff --git a/chrome/renderer/extensions/module_system.cc b/chrome/renderer/extensions/module_system.cc
index 0580fb6..657a780 100644
--- a/chrome/renderer/extensions/module_system.cc
+++ b/chrome/renderer/extensions/module_system.cc
@@ -132,12 +132,13 @@ ModuleSystem::ModuleSystem(ChromeV8Context* context, SourceMap* source_map)
       base::Bind(&ModuleSystem::Private, base::Unretained(this)));
 
   v8::Handle<v8::Object> global(context->v8_context()->Global());
+  v8::Isolate* isolate = context->isolate();
   global->SetHiddenValue(
-      v8::String::NewFromUtf8(context->isolate(), kModulesField),
-      v8::Object::New());
+      v8::String::NewFromUtf8(isolate, kModulesField),
+      v8::Object::New(isolate));
   global->SetHiddenValue(
-      v8::String::NewFromUtf8(context->isolate(), kModuleSystem),
-      v8::External::New(context->isolate(), this));
+      v8::String::NewFromUtf8(isolate, kModuleSystem),
+      v8::External::New(isolate, this));
 }
 
 ModuleSystem::~ModuleSystem() {
@@ -234,7 +235,7 @@ v8::Local<v8::Value> ModuleSystem::RequireForJsInner(
 
   v8::Handle<v8::Function> func = v8::Handle<v8::Function>::Cast(func_as_value);
 
-  exports = v8::Object::New();
+  exports = v8::Object::New(GetIsolate());
   v8::Handle<v8::Object> natives(NewInstance());
   CHECK(!natives.IsEmpty());  // this can happen if v8 has issues
 
@@ -454,7 +455,7 @@ void ModuleSystem::SetLazyField(v8::Handle<v8::Object> object,
                                 const std::string& module_field,
                                 v8::AccessorGetterCallback getter) {
   v8::HandleScope handle_scope(GetIsolate());
-  v8::Handle<v8::Object> parameters = v8::Object::New();
+  v8::Handle<v8::Object> parameters = v8::Object::New(GetIsolate());
   parameters->Set(v8::String::NewFromUtf8(GetIsolate(), kModuleName),
                   v8::String::NewFromUtf8(GetIsolate(), module_name.c_str()));
   parameters->Set(v8::String::NewFromUtf8(GetIsolate(), kModuleField),
@@ -575,7 +576,7 @@ void ModuleSystem::Private(const v8::FunctionCallbackInfo<v8::Value>& args) {
       v8::String::NewFromUtf8(GetIsolate(), "privates");
   v8::Local<v8::Value> privates = obj->GetHiddenValue(privates_key);
   if (privates.IsEmpty()) {
-    privates = v8::Object::New();
+    privates = v8::Object::New(args.GetIsolate());
     obj->SetHiddenValue(privates_key, privates);
   }
   args.GetReturnValue().Set(privates);
diff --git a/chrome/renderer/extensions/object_backed_native_handler.cc b/chrome/renderer/extensions/object_backed_native_handler.cc
index 272bf81..c99a6c9 100644
--- a/chrome/renderer/extensions/object_backed_native_handler.cc
+++ b/chrome/renderer/extensions/object_backed_native_handler.cc
@@ -62,7 +62,7 @@ void ObjectBackedNativeHandler::RouteFunction(
   v8::HandleScope handle_scope(isolate);
   v8::Context::Scope context_scope(context_->v8_context());
 
-  v8::Persistent<v8::Object> data(isolate, v8::Object::New());
+  v8::Persistent<v8::Object> data(isolate, v8::Object::New(isolate));
   v8::Local<v8::Object> local_data = v8::Local<v8::Object>::New(isolate, data);
   local_data->Set(
       v8::String::NewFromUtf8(isolate, kHandlerFunction),
diff --git a/chrome/renderer/loadtimes_extension_bindings.cc b/chrome/renderer/loadtimes_extension_bindings.cc
index 72c911a..1737e0b 100644
--- a/chrome/renderer/loadtimes_extension_bindings.cc
+++ b/chrome/renderer/loadtimes_extension_bindings.cc
@@ -105,7 +105,7 @@ class LoadTimesExtensionWrapper : public v8::Extension {
         DocumentState* document_state =
             DocumentState::FromDataSource(data_source);
         v8::Isolate* isolate = args.GetIsolate();
-        v8::Local<v8::Object> load_times = v8::Object::New();
+        v8::Local<v8::Object> load_times = v8::Object::New(isolate);
         load_times->Set(
             v8::String::NewFromUtf8(isolate, "requestTime"),
             v8::Number::New(isolate,
@@ -174,7 +174,7 @@ class LoadTimesExtensionWrapper : public v8::Extension {
         DocumentState* document_state =
             DocumentState::FromDataSource(data_source);
         v8::Isolate* isolate = args.GetIsolate();
-        v8::Local<v8::Object> csi = v8::Object::New();
+        v8::Local<v8::Object> csi = v8::Object::New(isolate);
         base::Time now = base::Time::Now();
         base::Time start = document_state->request_time().is_null() ?
             document_state->start_load_time() :
diff --git a/chrome/renderer/searchbox/searchbox_extension.cc b/chrome/renderer/searchbox/searchbox_extension.cc
index 4aba699..8423a85 100644
--- a/chrome/renderer/searchbox/searchbox_extension.cc
+++ b/chrome/renderer/searchbox/searchbox_extension.cc
@@ -122,7 +122,7 @@ v8::Handle<v8::Object> GenerateMostVisitedItem(
   if (title.empty())
     title = UTF8ToUTF16(mv_item.url.spec());
 
-  v8::Handle<v8::Object> obj = v8::Object::New();
+  v8::Handle<v8::Object> obj = v8::Object::New(isolate);
   obj->Set(v8::String::NewFromUtf8(isolate, "renderViewId"),
            v8::Int32::New(isolate, render_view_id));
   obj->Set(v8::String::NewFromUtf8(isolate, "rid"),
@@ -723,7 +723,7 @@ void SearchBoxExtensionWrapper::GetSuggestionToPrefetch(
   const InstantSuggestion& suggestion =
       SearchBox::Get(render_view)->suggestion();
   v8::Isolate* isolate = args.GetIsolate();
-  v8::Handle<v8::Object> data = v8::Object::New();
+  v8::Handle<v8::Object> data = v8::Object::New(isolate);
   data->Set(v8::String::NewFromUtf8(isolate, "text"),
             UTF16ToV8String(isolate, suggestion.text));
   data->Set(v8::String::NewFromUtf8(isolate, "metadata"),
@@ -741,7 +741,7 @@ void SearchBoxExtensionWrapper::GetThemeBackgroundInfo(
   const ThemeBackgroundInfo& theme_info =
       SearchBox::Get(render_view)->GetThemeBackgroundInfo();
   v8::Isolate* isolate = args.GetIsolate();
-  v8::Handle<v8::Object> info = v8::Object::New();
+  v8::Handle<v8::Object> info = v8::Object::New(isolate);
 
   info->Set(v8::String::NewFromUtf8(isolate, "usingDefaultTheme"),
             v8::Boolean::New(isolate, theme_info.using_default_theme));
diff --git a/content/renderer/gpu/gpu_benchmarking_extension.cc b/content/renderer/gpu/gpu_benchmarking_extension.cc
index 602b6ec..77b81bc 100644
--- a/content/renderer/gpu/gpu_benchmarking_extension.cc
+++ b/content/renderer/gpu/gpu_benchmarking_extension.cc
@@ -423,7 +423,7 @@ class GpuBenchmarkingWrapper : public v8::Extension {
     context.render_view_impl()->GetGpuRenderingStats(&gpu_stats);
     BrowserRenderingStats browser_stats;
     context.render_view_impl()->GetBrowserRenderingStats(&browser_stats);
-    v8::Handle<v8::Object> stats_object = v8::Object::New();
+    v8::Handle<v8::Object> stats_object = v8::Object::New(args.GetIsolate());
 
     RenderingStatsEnumerator enumerator(args.GetIsolate(), stats_object);
     stats.rendering_stats.EnumerateFields(&enumerator);
@@ -486,13 +486,17 @@ class GpuBenchmarkingWrapper : public v8::Extension {
 
   static void OnSyntheticGestureCompleted(
       CallbackAndContext* callback_and_context) {
-    v8::HandleScope scope(callback_and_context->isolate());
+    v8::Isolate* isolate = callback_and_context->isolate();
+    v8::HandleScope scope(isolate);
     v8::Handle<v8::Context> context = callback_and_context->GetContext();
     v8::Context::Scope context_scope(context);
     WebFrame* frame = WebFrame::frameForContext(context);
     if (frame) {
       frame->callFunctionEvenIfScriptDisabled(
-          callback_and_context->GetCallback(), v8::Object::New(), 0, NULL);
+          callback_and_context->GetCallback(),
+          v8::Object::New(isolate),
+          0,
+          NULL);
     }
   }
 
@@ -744,7 +748,10 @@ class GpuBenchmarkingWrapper : public v8::Extension {
       v8::Handle<v8::Value> argv[] = { result };
 
       frame->callFunctionEvenIfScriptDisabled(
-          callback_and_context->GetCallback(), v8::Object::New(), 1, argv);
+          callback_and_context->GetCallback(),
+          v8::Object::New(isolate),
+          1,
+          argv);
     }
   }
 
@@ -777,7 +784,8 @@ class GpuBenchmarkingWrapper : public v8::Extension {
   static void OnMicroBenchmarkCompleted(
       CallbackAndContext* callback_and_context,
       scoped_ptr<base::Value> result) {
-    v8::HandleScope scope(callback_and_context->isolate());
+    v8::Isolate* isolate = callback_and_context->isolate();
+    v8::HandleScope scope(isolate);
     v8::Handle<v8::Context> context = callback_and_context->GetContext();
     v8::Context::Scope context_scope(context);
     WebFrame* frame = WebFrame::frameForContext(context);
@@ -788,7 +796,10 @@ class GpuBenchmarkingWrapper : public v8::Extension {
       v8::Handle<v8::Value> argv[] = { value };
 
       frame->callFunctionEvenIfScriptDisabled(
-          callback_and_context->GetCallback(), v8::Object::New(), 1, argv);
+          callback_and_context->GetCallback(),
+          v8::Object::New(isolate),
+          1,
+          argv);
     }
   }
 
diff --git a/content/renderer/pepper/v8_var_converter.cc b/content/renderer/pepper/v8_var_converter.cc
index 3f8b37e..e7e66d9 100644
--- a/content/renderer/pepper/v8_var_converter.cc
+++ b/content/renderer/pepper/v8_var_converter.cc
@@ -150,7 +150,7 @@ bool GetOrCreateV8Value(v8::Isolate* isolate,
       *result = v8::Array::New(isolate);
       break;
     case PP_VARTYPE_DICTIONARY:
-      *result = v8::Object::New();
+      *result = v8::Object::New(isolate);
       break;
     case PP_VARTYPE_OBJECT:
     case PP_VARTYPE_RESOURCE:
diff --git a/content/renderer/skia_benchmarking_extension.cc b/content/renderer/skia_benchmarking_extension.cc
index d19dd62..d2f5d9d 100644
--- a/content/renderer/skia_benchmarking_extension.cc
+++ b/content/renderer/skia_benchmarking_extension.cc
@@ -220,7 +220,7 @@ class SkiaBenchmarkingWrapper : public v8::Extension {
         buffer_pixels[i + 3] = SkGetPackedA32(c);
     }
 
-    v8::Handle<v8::Object> result = v8::Object::New();
+    v8::Handle<v8::Object> result = v8::Object::New(isolate);
     result->Set(v8::String::NewFromUtf8(isolate, "width"),
                 v8::Number::New(snapped_clip.width()));
     result->Set(v8::String::NewFromUtf8(isolate, "height"),
@@ -246,7 +246,7 @@ class SkiaBenchmarkingWrapper : public v8::Extension {
     v8::Local<v8::Array> result = v8::Array::New(isolate, canvas.getSize());
     for (int i = 0; i < canvas.getSize(); ++i) {
       DrawType cmd_type = canvas.getDrawCommandAt(i)->getType();
-      v8::Handle<v8::Object> cmd = v8::Object::New();
+      v8::Handle<v8::Object> cmd = v8::Object::New(isolate);
       cmd->Set(v8::String::NewFromUtf8(isolate, "cmd_type"),
                v8::Integer::New(isolate, cmd_type));
       cmd->Set(v8::String::NewFromUtf8(isolate, "cmd_string"),
diff --git a/content/renderer/v8_value_converter_impl.cc b/content/renderer/v8_value_converter_impl.cc
index 0244c33..6028d5d 100644
--- a/content/renderer/v8_value_converter_impl.cc
+++ b/content/renderer/v8_value_converter_impl.cc
@@ -201,7 +201,7 @@ v8::Handle<v8::Value> V8ValueConverterImpl::ToV8Array(
 v8::Handle<v8::Value> V8ValueConverterImpl::ToV8Object(
     v8::Isolate* isolate,
     const base::DictionaryValue* val) const {
-  v8::Handle<v8::Object> result(v8::Object::New());
+  v8::Handle<v8::Object> result(v8::Object::New(isolate));
 
   for (base::DictionaryValue::Iterator iter(*val);
        !iter.IsAtEnd(); iter.Advance()) {
diff --git a/gin/function_template.h b/gin/function_template.h
index f028f2d..91b3cdb 100644
--- a/gin/function_template.h
+++ b/gin/function_template.h
@@ -343,6 +343,7 @@ v8::Local<v8::FunctionTemplate> CreateFunctionTemplate(
   gin::Handle<HolderT> holder = CreateHandle(
       isolate, new HolderT(callback, callback_flags));
   return v8::FunctionTemplate::New(
+      isolate,
       &internal::Dispatcher<Sig>::DispatchToCallback,
       ConvertToV8<internal::CallbackHolderBase*>(isolate, holder.get()));
 }
diff --git a/gin/modules/module_registry.cc b/gin/modules/module_registry.cc
index 9dd3dbe..035c259 100644
--- a/gin/modules/module_registry.cc
+++ b/gin/modules/module_registry.cc
@@ -94,7 +94,7 @@ v8::Handle<String> GetHiddenValueKey(Isolate* isolate) {
 }  // namespace
 
 ModuleRegistry::ModuleRegistry(Isolate* isolate)
-    : modules_(isolate, Object::New()) {
+    : modules_(isolate, Object::New(isolate)) {
 }
 
 ModuleRegistry::~ModuleRegistry() {