Index: headless/lib/browser/headless_browser_impl.cc |
diff --git a/headless/lib/browser/headless_browser_impl.cc b/headless/lib/browser/headless_browser_impl.cc |
index 876be95cdc802db462bc1876df03d2d11e8597b5..4f21d8c81ab35ef51551fe7ac2edb6de1d4994d2 100644 |
--- a/headless/lib/browser/headless_browser_impl.cc |
+++ b/headless/lib/browser/headless_browser_impl.cc |
@@ -26,6 +26,11 @@ |
#include "ui/events/devices/device_data_manager.h" |
#include "ui/gfx/geometry/size.h" |
+#if defined(OS_WIN) |
+#include "content/public/app/sandbox_helper_win.h" |
+#include "sandbox/win/src/sandbox_types.h" |
+#endif |
+ |
namespace headless { |
namespace { |
@@ -33,8 +38,10 @@ int RunContentMain( |
HeadlessBrowser::Options options, |
const base::Callback<void(HeadlessBrowser*)>& on_browser_start_callback) { |
content::ContentMainParams params(nullptr); |
- params.argc = options.argc; |
- params.argv = options.argv; |
+ sandbox::SandboxInterfaceInfo sandbox_info = {0}; |
dvallet
2017/02/13 03:20:24
Please change to:
#if defined(OS_WIN)
sandbox::S
|
+ content::InitializeSandboxInfo(&sandbox_info); |
+ |
+ params.sandbox_info = &sandbox_info; |
// TODO(skyostil): Implement custom message pumps. |
DCHECK(!options.message_pump); |
@@ -189,11 +196,11 @@ HeadlessBrowserContext* HeadlessBrowserImpl::GetBrowserContextForId( |
} |
void RunChildProcessIfNeeded(int argc, const char** argv) { |
- base::CommandLine command_line(argc, argv); |
+ base::CommandLine command_line(0, nullptr); |
dvallet
2017/02/13 03:20:24
Revert thes changes.
|
if (!command_line.HasSwitch(switches::kProcessType)) |
return; |
- HeadlessBrowser::Options::Builder builder(argc, argv); |
+ HeadlessBrowser::Options::Builder builder(0, nullptr); |
dvallet
2017/02/13 03:20:24
ditto, revert this
|
exit(RunContentMain(builder.Build(), |
base::Callback<void(HeadlessBrowser*)>())); |
} |