Revert of Add --headless flag to Windows

headless/app/headless_shell.cc

 // Copyright 2016 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.
 
 #include <memory>
 #include <sstream>
 #include <string>
 #include <utility>
 
 #include "base/base64.h"
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/json/json_writer.h"
 #include "base/location.h"
 #include "base/memory/weak_ptr.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/strings/string_number_conversions.h"
-#include "content/public/app/content_main.h"
 #include "headless/app/headless_shell.h"
 #include "headless/app/headless_shell_switches.h"
 #include "headless/public/headless_devtools_target.h"
 #include "headless/public/util/deterministic_http_protocol_handler.h"
 #include "net/base/io_buffer.h"
 #include "net/base/ip_address.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_util.h"
 #include "ui/gfx/geometry/size.h"
 
-#if defined(OS_WIN)
-#include "sandbox/win/src/sandbox_types.h"
-#endif
-
 namespace headless {
 namespace {
 // Address where to listen to incoming DevTools connections.
 const char kDevToolsHttpServerAddress[] = "127.0.0.1";
 // Default file name for screenshot. Can be overriden by "--screenshot" switch.
 const char kDefaultScreenshotFileName[] = "screenshot.png";
 // Default file name for pdf. Can be overriden by "--print-to-pdf" switch.
 const char kDefaultPDFFileName[] = "output.pdf";
 
 bool ParseWindowSize(std::string window_size, gfx::Size* parsed_window_size) {
@@ skipping 376 matching lines @@
   if (!file_proxy_->Write(
           0, buf->data(), buf->size(),
           base::Bind(&HeadlessShell::OnFileWritten, weak_factory_.GetWeakPtr(),
                      file_name, buf->size()))) {
     // Operation may have completed successfully or failed.
     OnFileWritten(file_name, buf->size(), base::File::FILE_ERROR_FAILED, 0);
   }
 }
 
 void HeadlessShell::OnFileWritten(const base::FilePath file_name,
-                                  const size_t length,
+                                  const int length,
                                   base::File::Error error_code,
                                   int write_result) {
-  if (write_result < static_cast<int>(length)) {
+  if (write_result < length) {
     // TODO(eseckler): Support recovering from partial writes.
     LOG(ERROR) << "Writing to file " << file_name.value()
                << " was unsuccessful: "
                << base::File::ErrorToString(error_code);
   } else {
     LOG(INFO) << "Written to file " << file_name.value() << ".";
   }
   if (!file_proxy_->Close(base::Bind(&HeadlessShell::OnFileClosed,
                                      weak_factory_.GetWeakPtr()))) {
     // Operation could not be started.
@@ skipping 49 matching lines @@
     return false;
   }
   if (command_line.HasSwitch(switches::kVirtualTimeBudget)) {
     LOG(ERROR) << "Virtual time budget is disabled "
                << "when remote debugging is enabled.";
     return false;
   }
   return true;
 }
 
-#if defined(OS_WIN)
-int HeadlessShellMain(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
 int HeadlessShellMain(int argc, const char** argv) {
   base::CommandLine::Init(argc, argv);
   RunChildProcessIfNeeded(argc, argv);
+  HeadlessShell shell;
   HeadlessBrowser::Options::Builder builder(argc, argv);
-#endif  // defined(OS_WIN)
-  HeadlessShell shell;
 
   // Enable devtools if requested.
   const base::CommandLine& command_line(
       *base::CommandLine::ForCurrentProcess());
   if (!ValidateCommandLine(command_line))
     return EXIT_FAILURE;
 
-  if (command_line.HasSwitch(switches::kEnableCrashReporter))
+  if (command_line.HasSwitch(::switches::kEnableCrashReporter))
     builder.SetCrashReporterEnabled(true);
   if (command_line.HasSwitch(switches::kCrashDumpsDir)) {
     builder.SetCrashDumpsDir(
         command_line.GetSwitchValuePath(switches::kCrashDumpsDir));
   }
 
   if (command_line.HasSwitch(::switches::kRemoteDebuggingPort)) {
     std::string address = kDevToolsHttpServerAddress;
     if (command_line.HasSwitch(switches::kRemoteDebuggingAddress)) {
       address =
@@ skipping 67 matching lines @@
     std::string ua = command_line.GetSwitchValueASCII(switches::kUserAgent);
     if (net::HttpUtil::IsValidHeaderValue(ua))
       builder.SetUserAgent(ua);
   }
 
   return HeadlessBrowserMain(
       builder.Build(),
       base::Bind(&HeadlessShell::OnStart, base::Unretained(&shell)));
 }
 
-int HeadlessShellMain(const content::ContentMainParams& params) {
-#if defined(OS_WIN)
-  return HeadlessShellMain(params.instance, params.sandbox_info);
-#else
-  return HeadlessShellMain(params.argc, params.argv);
-#endif
-}
-
 }  // namespace headless