Commit a16fbb09 authored by Xida Chen's avatar Xida Chen Committed by Commit Bot

Revert "build cachetool on windows"

This reverts commit 35e625a4.

Reason for revert:
I think this caused compile failure:
https://ci.chromium.org/p/chromium/builders/ci/win32-archive-rel/9728?blamelist=1#blamelist-tab

Original change's description:
> build cachetool on windows
> 
> The only issue seems to be handling arguments :)
> 
> Change-Id: I1574bf3fdb50b15c9599adb63395c83bc28681a0
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2018125
> Reviewed-by: Ryan Sleevi <rsleevi@chromium.org>
> Commit-Queue: Jeremy Apthorp <jeremya@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#737401}

TBR=rsleevi@chromium.org,jeremya@chromium.org

Change-Id: I5665cd7302b6f6ade7a48a7c278b15fae5a3aa29
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2033341Reviewed-by: default avatarXida Chen <xidachen@chromium.org>
Commit-Queue: Xida Chen <xidachen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#737410}
parent 16e4a068
......@@ -2434,7 +2434,7 @@ if (use_external_gssapi) {
}
}
if (is_linux || is_mac || is_win) {
if (is_linux || is_mac) {
executable("cachetool") {
testonly = true
sources = [ "tools/cachetool/cachetool.cc" ]
......
......@@ -15,13 +15,11 @@
#include "base/message_loop/message_pump_type.h"
#include "base/run_loop.h"
#include "base/stl_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_piece.h"
#include "base/strings/stringprintf.h"
#include "base/task/single_thread_task_executor.h"
#include "base/task/thread_pool/thread_pool_instance.h"
#include "build/build_config.h"
#include "net/base/io_buffer.h"
#include "net/base/test_completion_callback.h"
#include "net/disk_cache/disk_cache.h"
......@@ -173,11 +171,7 @@ class ProgramArgumentCommandMarshal final : public CommandMarshal {
// Implements CommandMarshal.
std::string ReadString() override {
if (args_id_ < command_line_args_.size())
#if defined(OS_WIN)
return base::WideToUTF8(command_line_args_[args_id_++]);
#else
return command_line_args_[args_id_++];
#endif
if (!has_failed())
ReturnFailure("Command line arguments to short.");
return "";
......@@ -700,11 +694,7 @@ int main(int argc, char* argv[]) {
base::ThreadPoolInstance::CreateAndStartWithDefaultParams("cachetool");
base::FilePath cache_path(args[0]);
#if defined(OS_WIN)
std::string cache_backend_type(base::WideToUTF8(args[1]));
#else
std::string cache_backend_type(args[1]);
#endif
net::BackendType backend_type;
if (cache_backend_type == "simple") {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment