Index: chrome/test/base/module_system_test.cc |
diff --git a/chrome/test/base/module_system_test.cc b/chrome/test/base/module_system_test.cc |
index 56024269e7736c3e23ca20ea7ce0c9898aeeaf90..1a40de2c3c742dc7d3ab5842879adbda03efe64f 100644 |
--- a/chrome/test/base/module_system_test.cc |
+++ b/chrome/test/base/module_system_test.cc |
@@ -7,6 +7,7 @@ |
#include "base/callback.h" |
#include "base/memory/scoped_ptr.h" |
#include "base/strings/string_piece.h" |
+#include "chrome/renderer/extensions/chrome_v8_context.h" |
#include "chrome/renderer/extensions/object_backed_native_handler.h" |
#include "ui/base/resource/resource_bundle.h" |
@@ -69,7 +70,7 @@ class StringSourceMap : public ModuleSystem::SourceMap { |
} |
void RegisterModule(const std::string& name, const std::string& source) { |
- CHECK_EQ(0u, source_map_.count(name)); |
+ CHECK_EQ(0u, source_map_.count(name)) << "Module " << name << " not found"; |
source_map_[name] = source; |
} |
@@ -79,8 +80,8 @@ class StringSourceMap : public ModuleSystem::SourceMap { |
class FailsOnException : public ModuleSystem::ExceptionHandler { |
public: |
- virtual void HandleUncaughtException() OVERRIDE { |
- FAIL(); |
+ virtual void HandleUncaughtException(const v8::TryCatch& try_catch) OVERRIDE { |
+ FAIL() << "Uncaught exception: " << CreateExceptionString(try_catch); |
} |
}; |
@@ -92,7 +93,12 @@ ModuleSystemTest::ModuleSystemTest() |
should_assertions_be_made_(true) { |
context_->Enter(); |
assert_natives_ = new AssertNatives(context_.get()); |
- module_system_.reset(new ModuleSystem(context_.get(), source_map_.get())); |
+ module_system_.reset(new ModuleSystem( |
+ new extensions::ChromeV8Context(context_.get(), |
+ NULL, // WebFrame |
+ NULL, // Extension |
+ extensions::Feature::UNSPECIFIED_CONTEXT), |
+ source_map_.get())); |
module_system_->RegisterNativeHandler("assert", scoped_ptr<NativeHandler>( |
assert_natives_)); |
module_system_->SetExceptionHandlerForTest( |