Locate test data more robustly

util/win/process_info_test.cc

 // 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/win/process_info.h"
 
 #include <rpc.h>
 #include <wchar.h>
 
 #include "base/files/file_path.h"
 #include "build/build_config.h"
 #include "gtest/gtest.h"
 #include "util/misc/uuid.h"
-#include "util/test/executable_path.h"
+#include "util/test/paths.h"
 #include "util/win/scoped_handle.h"
 
 namespace crashpad {
 namespace test {
 namespace {
 
 const wchar_t kNtdllName[] = L"\\ntdll.dll";
 
 TEST(ProcessInfo, Self) {
   ProcessInfo process_info;
@@ skipping 35 matching lines @@
   ASSERT_EQ(RPC_S_OK, UuidCreate(&system_uuid));
   UUID done_uuid(reinterpret_cast<const uint8_t*>(&system_uuid.Data1));
 
   ScopedKernelHANDLE started(
       CreateEvent(nullptr, true, false, started_uuid.ToString16().c_str()));
   ASSERT_TRUE(started.get());
   ScopedKernelHANDLE done(
       CreateEvent(nullptr, true, false, done_uuid.ToString16().c_str()));
   ASSERT_TRUE(done.get());
 
-  base::FilePath test_executable = ExecutablePath();
+  base::FilePath test_executable = Paths::Executable();
   std::wstring child_test_executable =
       test_executable.RemoveFinalExtension().value() +
       L"_process_info_test_child.exe";
   // TODO(scottmg): Command line escaping utility.
   std::wstring command_line = child_test_executable + L" " +
                               started_uuid.ToString16() + L" " +
                               done_uuid.ToString16();
   STARTUPINFO startup_info = {0};
   startup_info.cb = sizeof(startup_info);
   PROCESS_INFORMATION process_information;
@@ skipping 35 matching lines @@
   const wchar_t kLz32dllName[] = L"\\lz32.dll";
   ASSERT_GE(modules.back().size(), wcslen(kLz32dllName));
   EXPECT_EQ(
       kLz32dllName,
       modules.back().substr(modules.back().size() - wcslen(kLz32dllName)));
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace crashpad