Index: extensions/renderer/module_system.cc |
diff --git a/extensions/renderer/module_system.cc b/extensions/renderer/module_system.cc |
index f9e8d91df590065a82a31cf5725ab0aa320c1049..5938556191ae68976accf72d8f6e60bc23eb40ec 100644 |
--- a/extensions/renderer/module_system.cc |
+++ b/extensions/renderer/module_system.cc |
@@ -551,12 +551,8 @@ v8::Handle<v8::String> ModuleSystem::WrapSource(v8::Handle<v8::String> source) { |
GetIsolate(), |
"(function(define, require, requireNative, requireAsync, exports, " |
"console, privates," |
- "$Array, $Function, $JSON, $Object, $RegExp, $String) {" |
- "'use strict';" |
- // Prevent extensions from overriding the Error constructor. |
- // Use window.Error instead of $Error to make sure that extensions can |
- // still use "instanceof Error" for exception handling. |
- "var Error = window.Error;"); |
+ "$Array, $Function, $JSON, $Object, $RegExp, $String, $Error) {" |
+ "'use strict';"); |
v8::Handle<v8::String> right = v8::String::NewFromUtf8(GetIsolate(), "\n})"); |
return handle_scope.Escape(v8::Local<v8::String>( |
v8::String::Concat(left, v8::String::Concat(source, right)))); |
@@ -628,6 +624,7 @@ v8::Handle<v8::Value> ModuleSystem::LoadModule(const std::string& module_name) { |
context_->safe_builtins()->GetObjekt(), |
context_->safe_builtins()->GetRegExp(), |
context_->safe_builtins()->GetString(), |
+ context_->safe_builtins()->GetError(), |
}; |
{ |
v8::TryCatch try_catch; |