win: Work towards getting 'minidump' to compile

minidump/crashpad_dbghelp.h

 // Copyright 2015 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "util/test/executable_path.h"
+#ifndef CRASHPAD_MINIDUMP_CRASHPAD_DBGHELP_H_
+#define CRASHPAD_MINIDUMP_CRASHPAD_DBGHELP_H_
 
+#include "build/build_config.h"
+
+// dbghelp.h requires windows.h to be included before it, so instead of
+// including dbghelp.h directly, we always include crashpad_dbghelp.h instead.
+
+#if defined(OS_WIN)
 #include <windows.h>
+#endif  // OS_WIN
 
-namespace crashpad {
-namespace test {
+#include <dbghelp.h>
 
-base::FilePath ExecutablePath() {
-  wchar_t executable_path[_MAX_PATH];
-  GetModuleFileName(nullptr, executable_path, sizeof(executable_path));
-  return base::FilePath(executable_path);
-}
-
-}  // namespace test
-}  // namespace crashpad
+#endif  // CRASHPAD_CRASHPAD_MINIDUMP_CRASHPAD_DBGHELP_H_