| 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 c45408f9e38013ca3c1602cb97439a2633178ea7..0bc9ab655a50646c8602f235a61e2e829d803304 100644
|
| --- a/headless/lib/browser/headless_browser_impl.cc
|
| +++ b/headless/lib/browser/headless_browser_impl.cc
|
| @@ -196,16 +196,24 @@ HeadlessBrowserContext* HeadlessBrowserImpl::GetBrowserContextForId(
|
| return find_it->second.get();
|
| }
|
|
|
| -#if !defined(OS_WIN)
|
| +#if defined(OS_WIN)
|
| +void RunChildProcessIfNeeded(HINSTANCE instance,
|
| + sandbox::SandboxInterfaceInfo* sandbox_info) {
|
| + base::CommandLine::Init(0, nullptr);
|
| + HeadlessBrowser::Options::Builder builder(0, nullptr);
|
| + builder.SetInstance(instance);
|
| + builder.SetSandboxInfo(std::move(sandbox_info));
|
| +#else
|
| void RunChildProcessIfNeeded(int argc, const char** argv) {
|
| base::CommandLine::Init(argc, argv);
|
| + HeadlessBrowser::Options::Builder builder(argc, argv);
|
| +#endif // defined(OS_WIN)
|
| const base::CommandLine& command_line(
|
| *base::CommandLine::ForCurrentProcess());
|
|
|
| if (!command_line.HasSwitch(::switches::kProcessType))
|
| return;
|
|
|
| - HeadlessBrowser::Options::Builder builder(argc, argv);
|
| if (command_line.HasSwitch(switches::kUserAgent)) {
|
| std::string ua = command_line.GetSwitchValueASCII(switches::kUserAgent);
|
| if (net::HttpUtil::IsValidHeaderValue(ua))
|
| @@ -215,7 +223,6 @@ void RunChildProcessIfNeeded(int argc, const char** argv) {
|
| exit(RunContentMain(builder.Build(),
|
| base::Callback<void(HeadlessBrowser*)>()));
|
| }
|
| -#endif // !defined(OS_WIN)
|
|
|
| int HeadlessBrowserMain(
|
| HeadlessBrowser::Options options,
|
|
|