Revert of Add --headless flag to Windows

headless/public/headless_browser.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef HEADLESS_PUBLIC_HEADLESS_BROWSER_H_
 #define HEADLESS_PUBLIC_HEADLESS_BROWSER_H_
 
 #include <memory>
 #include <string>
 #include <unordered_map>
 #include <unordered_set>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "headless/public/headless_browser_context.h"
 #include "headless/public/headless_export.h"
 #include "headless/public/headless_web_contents.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/ip_endpoint.h"
 #include "ui/gfx/geometry/size.h"
 
-#if defined(OS_WIN)
-#include "sandbox/win/src/sandbox_types.h"
-#endif
-
 namespace base {
 class MessagePump;
 class SingleThreadTaskRunner;
 }
 
 namespace headless {
 
 // This class represents the global headless browser instance. To get a pointer
 // to one, call |HeadlessBrowserMain| to initiate the browser main loop. An
 // instance of |HeadlessBrowser| will be passed to the callback given to that
@@ skipping 47 matching lines @@
 
  protected:
   HeadlessBrowser() {}
   virtual ~HeadlessBrowser() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(HeadlessBrowser);
 };
 
 // Embedding API overrides for the headless browser.
-struct HEADLESS_EXPORT HeadlessBrowser::Options {
+struct HeadlessBrowser::Options {
   class Builder;
 
   Options(Options&& options);
   ~Options();
 
   Options& operator=(Options&& options);
 
   // Command line options to be passed to browser.
   int argc;
   const char** argv;
 
-#if defined(OS_WIN)
-  // Set hardware instance if available, otherwise it defaults to 0.
-  HINSTANCE instance;
-
-  // Set with sandbox information. This has to be already initialized.
-  sandbox::SandboxInterfaceInfo* sandbox_info;
-#endif
-
   // Address at which DevTools should listen for connections. Disabled by
   // default.
   net::IPEndPoint devtools_endpoint;
 
   // Optional message pump that overrides the default. Must outlive the browser.
   base::MessagePump* message_pump;
 
   // Run the browser in single process mode instead of using separate renderer
   // processes as per default. Note that this also disables any sandboxing of
   // web content, which can be a security risk.
@@ skipping 51 matching lines @@
   base::FilePath crash_dumps_dir;
 
   // Reminder: when adding a new field here, do not forget to add it to
   // HeadlessBrowserContextOptions (where appropriate).
  private:
   Options(int argc, const char** argv);
 
   DISALLOW_COPY_AND_ASSIGN(Options);
 };
 
-class HEADLESS_EXPORT HeadlessBrowser::Options::Builder {
+class HeadlessBrowser::Options::Builder {
  public:
   Builder(int argc, const char** argv);
   Builder();
   ~Builder();
 
   // Browser-wide settings.
 
   Builder& EnableDevToolsServer(const net::IPEndPoint& endpoint);
   Builder& SetMessagePump(base::MessagePump* message_pump);
   Builder& SetSingleProcessMode(bool single_process_mode);
   Builder& SetDisableSandbox(bool disable_sandbox);
   Builder& SetGLImplementation(const std::string& gl_implementation);
   Builder& AddMojoServiceName(const std::string& mojo_service_name);
-#if defined(OS_WIN)
-  Builder& SetInstance(HINSTANCE instance);
-  Builder& SetSandboxInfo(sandbox::SandboxInterfaceInfo* sandbox_info);
-#endif
 
   // Per-context settings.
 
   Builder& SetProductNameAndVersion(
       const std::string& product_name_and_version);
   Builder& SetUserAgent(const std::string& user_agent);
   Builder& SetProxyServer(const net::HostPortPair& proxy_server);
   Builder& SetHostResolverRules(const std::string& host_resolver_rules);
   Builder& SetWindowSize(const gfx::Size& window_size);
   Builder& SetUserDataDir(const base::FilePath& user_data_dir);
@@ skipping 23 matching lines @@
 // int main(int argc, const char** argv) {
 //   headless::RunChildProcessIfNeeded(argc, argv);
 //   headless::HeadlessBrowser::Options::Builder builder(argc, argv);
 //   return headless::HeadlessBrowserMain(
 //       builder.Build(),
 //       base::Callback<void(headless::HeadlessBrowser*)>());
 // }
 //
 // [1]
 // https://chromium.googlesource.com/chromium/src/+/master/docs/linux_zygote.md
-#if !defined(OS_WIN)
-HEADLESS_EXPORT void RunChildProcessIfNeeded(int argc, const char** argv);
-#endif
+void RunChildProcessIfNeeded(int argc, const char** argv);
 
 // Main entry point for running the headless browser. This function constructs
 // the headless browser instance, passing it to the given
 // |on_browser_start_callback| callback. Note that since this function executes
 // the main loop, it will only return after HeadlessBrowser::Shutdown() is
 // called, returning the exit code for the process. It is not possible to
 // initialize the browser again after it has been torn down.
-HEADLESS_EXPORT int HeadlessBrowserMain(
+int HeadlessBrowserMain(
     HeadlessBrowser::Options options,
     const base::Callback<void(HeadlessBrowser*)>& on_browser_start_callback);
 
 }  // namespace headless
 
 #endif  // HEADLESS_PUBLIC_HEADLESS_BROWSER_H_