rubycoder
diff --git a/‎src/browser/nw_extensions_browser_hooks.cc
Lines changed: 6 additions & 2 deletions b/‎src/browser/nw_extensions_browser_hooks.cc
Lines changed: 6 additions & 2 deletions
diff --git a/‎src/browser/nw_extensions_browser_hooks.h
Lines changed: 3 additions & 1 deletion b/‎src/browser/nw_extensions_browser_hooks.h
Lines changed: 3 additions & 1 deletion
diff --git a/‎src/nw_base.cc
Lines changed: 6 additions & 1 deletion b/‎src/nw_base.cc
Lines changed: 6 additions & 1 deletion
diff --git a/‎src/nw_base.h
Lines changed: 5 additions & 1 deletion b/‎src/nw_base.h
Lines changed: 5 additions & 1 deletion
@@ -203,15 +203,19 @@ bool RphGuestFilterURLHook(RenderProcessHost* rph, const GURL* url)  {
 typedef bool (*RphGuestFilterURLHookFn)(content::RenderProcessHost* rph, const GURL* url);
 CONTENT_EXPORT extern RphGuestFilterURLHookFn gRphGuestFilterURLHook;
 
-void LoadNWAppAsExtensionHook(base::DictionaryValue* manifest, std::string* error) {
+void LoadNWAppAsExtensionHook(base::DictionaryValue* manifest,
+                              const base::FilePath& extension_path,
+                              std::string* error) {
   gRphGuestFilterURLHook = RphGuestFilterURLHook;
   if (!manifest)
     return;
 
   std::string main_url, bg_script, icon_path;
   base::Value *node_remote = NULL;
 
-  nw::Package* package = nw::package();
+  const base::CommandLine* cmdline = base::CommandLine::ForCurrentProcess();
+  nw::Package* package = cmdline->HasSwitch("nwjs-test-mode") ?
+    nw::package(&extension_path) : nw::package();
   manifest->SetBoolean(manifest_keys::kNWJSInternalFlag, true);
   if (error && !package->cached_error_content().empty()) {
     *error = package->cached_error_content();
 
@@ -32,7 +32,9 @@ namespace gfx {
 namespace nw {
 // browser
 // ref in extensions/common/file_util.cc
-void LoadNWAppAsExtensionHook(base::DictionaryValue* manifest, std::string* error);
+void LoadNWAppAsExtensionHook(base::DictionaryValue* manifest,
+                              const base::FilePath& extension_path,
+                              std::string* error);
 // ref in extensions/browser/app_window/app_window.cc 
 void CalcNewWinParams(content::WebContents* new_contents, void* params,
                      std::string* nw_inject_js_doc_start,
 
@@ -11,7 +11,12 @@ int exit_code;
 base::string16 g_current_new_win_manifest;
 }
 
-Package* package() {
+Package* package(const base::FilePath* path) {
+  if (path) {
+    if (g_package)
+      delete g_package;
+    g_package = new Package(*path);
+  }
   return g_package;
 }
 
 
@@ -3,8 +3,12 @@
 #include "content/nw/src/nw_export.h"
 #include "content/nw/src/nw_package.h"
 
+namespace base {
+class FilePath;
+}
+
 namespace nw {
-  NW_EXPORT Package* package();
+  NW_EXPORT Package* package(const base::FilePath* path = nullptr);
   NW_EXPORT Package* InitNWPackage();
   NW_EXPORT void ReleaseNWPackage();
   NW_EXPORT int ExitCodeHook();
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,12 @@ int exit_code;`
`11`	`11`	`base::string16 g_current_new_win_manifest;`
`12`	`12`	`}`
`13`	`13`
`14`		`-Package* package() {`
	`14`	`+Package* package(const base::FilePath* path) {`
	`15`	`+ if (path) {`
	`16`	`+ if (g_package)`
	`17`	`+ delete g_package;`
	`18`	`+ g_package = new Package(*path);`
	`19`	`+ }`
`15`	`20`	`return g_package;`
`16`	`21`	`}`
`17`	`22`