Add ExceptionHandler to ModuleSystem, remove heap allocated v8::TryCatch.

chrome/test/base/module_system_test.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/test/base/module_system_test.h"
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_piece.h"
 #include "chrome/renderer/extensions/native_handler.h"
@@ skipping 57 matching lines @@
 
   void RegisterModule(const std::string& name, const std::string& source) {
     CHECK_EQ(0u, source_map_.count(name));
     source_map_[name] = source;
   }
 
  private:
   std::map<std::string, std::string> source_map_;
 };
 
+class FailsOnException : public ModuleSystem::ExceptionHandler {
+ public:
+  virtual void HandleUncaughtException() {
+    FAIL();
+  }
+};
+
 ModuleSystemTest::ModuleSystemTest()
     : context_(v8::Context::New()),
       source_map_(new StringSourceMap()),
       should_assertions_be_made_(true) {
   context_->Enter();
   assert_natives_ = new AssertNatives();
   module_system_.reset(new ModuleSystem(context_, source_map_.get()));
   module_system_->RegisterNativeHandler("assert", scoped_ptr<NativeHandler>(
       assert_natives_));
-  try_catch_.SetCaptureMessage(true);
+  module_system_->set_exception_handler(
+      scoped_ptr<ModuleSystem::ExceptionHandler>(new FailsOnException));
 }
 
 ModuleSystemTest::~ModuleSystemTest() {
   module_system_.reset();
   context_->Exit();
   context_.Dispose();
 }
 
 void ModuleSystemTest::RegisterModule(const std::string& name,
                                       const std::string& code) {
   source_map_->RegisterModule(name, code);
 }
 
 void ModuleSystemTest::RegisterModule(const std::string& name,
                                       int resource_id) {
   const std::string& code = ResourceBundle::GetSharedInstance().
       GetRawDataResource(resource_id).as_string();
   source_map_->RegisterModule(name, code);
 }
 
 void ModuleSystemTest::OverrideNativeHandler(const std::string& name,
                                              const std::string& code) {
   RegisterModule(name, code);
   module_system_->OverrideNativeHandler(name);
 }
 
 void ModuleSystemTest::TearDown() {
-  if (try_catch_.HasCaught())
-    ModuleSystem::DumpException(try_catch_);
-  EXPECT_FALSE(try_catch_.HasCaught());
   // All tests must assert at least once unless otherwise specified.
   EXPECT_EQ(should_assertions_be_made_,
             assert_natives_->assertion_made());
   EXPECT_FALSE(assert_natives_->failed());
 }
 
 void ModuleSystemTest::ExpectNoAssertionsMade() {
   should_assertions_be_made_ = false;
 }
 
 v8::Handle<v8::Object> ModuleSystemTest::CreateGlobal(const std::string& name) {
   v8::HandleScope handle_scope;
   v8::Handle<v8::Object> object = v8::Object::New();
   v8::Context::GetCurrent()->Global()->Set(v8::String::New(name.c_str()),
                                            object);
   return handle_scope.Close(object);
 }