Make ExtensionMsg_MessageInvoke run a module system function rather than a

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/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"
 
 #include <map>
 #include <string>
 
 using extensions::ModuleSystem;
 using extensions::NativeHandler;
 using extensions::ObjectBackedNativeHandler;
 
@@ skipping 42 matching lines @@
     if (source_map_.count(name) == 0)
       return v8::Undefined();
     return v8::String::New(source_map_[name].c_str());
   }
 
   virtual bool Contains(const std::string& name) OVERRIDE {
     return source_map_.count(name);
   }
 
   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;
   }
 
  private:
   std::map<std::string, std::string> source_map_;
 };
 
 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);
   }
 };
 
 ModuleSystemTest::ModuleSystemTest()
     : isolate_(v8::Isolate::GetCurrent()),
       handle_scope_(isolate_),
       context_(
           new extensions::ChromeV8Context(
               v8::Context::New(isolate_),
-              reinterpret_cast<WebKit::WebFrame*>(1),
-              NULL,
+              NULL,  // WebFrame
+              NULL,  // Extension
               extensions::Feature::UNSPECIFIED_CONTEXT)),
       source_map_(new StringSourceMap()),
       should_assertions_be_made_(true) {
   context_->v8_context()->Enter();
   assert_natives_ = new AssertNatives(context_.get());
   module_system_.reset(new ModuleSystem(context_.get(), source_map_.get()));
   module_system_->RegisterNativeHandler("assert", scoped_ptr<NativeHandler>(
       assert_natives_));
   module_system_->SetExceptionHandlerForTest(
       scoped_ptr<ModuleSystem::ExceptionHandler>(new FailsOnException));
@@ skipping 33 matching lines @@
   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);
 }