From 467834b30f40d1aff0031fbb7660fb211c8112e4 Mon Sep 17 00:00:00 2001 From: "abarth@chromium.org" Date: Fri, 22 Nov 2013 07:30:55 +0000 Subject: Teach mojo_js_bindings_unittests to load generated JS files This CL generalizes gin::FileModuleProvider to be able to load modules from several places in the file system. I've then made use of this facility in mojo_js_bindings_unittests to load generated JavaScript modules created by mojom_js_generator.py, similar to how C++ files can #include from the generated mojom directory. I've deleted sample_service.js now that we can load it from the generated directory. BUG=317398 Review URL: https://codereview.chromium.org/81673002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236711 0039d316-1c4b-4281-b951-d872f2087c98 --- gin/modules/module_runner_delegate.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gin/modules/module_runner_delegate.cc') diff --git a/gin/modules/module_runner_delegate.cc b/gin/modules/module_runner_delegate.cc index 50b9f5e..3f2422c 100644 --- a/gin/modules/module_runner_delegate.cc +++ b/gin/modules/module_runner_delegate.cc @@ -8,8 +8,9 @@ namespace gin { -ModuleRunnerDelegate::ModuleRunnerDelegate(const base::FilePath& module_base) - : module_provider_(module_base) { +ModuleRunnerDelegate::ModuleRunnerDelegate( + const std::vector& search_paths) + : module_provider_(search_paths) { } ModuleRunnerDelegate::~ModuleRunnerDelegate() { -- cgit v1.1