Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7043)

Unified Diff: chrome/test/base/module_system_test.cc

Issue 15855010: Make ExtensionMsg_MessageInvoke run a module system function rather than a (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix test compile Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/renderer/resources/renderer_resources.grd ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 5382fed71756a43e0782be1b4139d5773a7a01f1..ea144c26745c118efb7733893e9e5b44fe4dce25 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);
}
};
@@ -90,8 +91,8 @@ ModuleSystemTest::ModuleSystemTest()
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) {
« no previous file with comments | « chrome/renderer/resources/renderer_resources.grd ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698