| Index: third_party/crashpad/crashpad/test/test_paths_test.cc
|
| diff --git a/third_party/crashpad/crashpad/test/paths_test.cc b/third_party/crashpad/crashpad/test/test_paths_test.cc
|
| similarity index 63%
|
| copy from third_party/crashpad/crashpad/test/paths_test.cc
|
| copy to third_party/crashpad/crashpad/test/test_paths_test.cc
|
| index 7cbca049e70f68e2e5715c380036faf62697dc87..9d43b594f50ec2dad8c68e7c3d5bb00f8caa32e4 100644
|
| --- a/third_party/crashpad/crashpad/test/paths_test.cc
|
| +++ b/third_party/crashpad/crashpad/test/test_paths_test.cc
|
| @@ -12,10 +12,9 @@
|
| // See the License for the specific language governing permissions and
|
| // limitations under the License.
|
|
|
| -#include "test/paths.h"
|
| +#include "test/test_paths.h"
|
|
|
| #include "base/files/file_path.h"
|
| -#include "build/build_config.h"
|
| #include "gtest/gtest.h"
|
| #include "util/file/file_io.h"
|
|
|
| @@ -23,22 +22,11 @@ namespace crashpad {
|
| namespace test {
|
| namespace {
|
|
|
| -TEST(Paths, Executable) {
|
| - base::FilePath executable_path = Paths::Executable();
|
| - base::FilePath executable_name = executable_path.BaseName();
|
| -#if defined(OS_WIN)
|
| - EXPECT_EQ(FILE_PATH_LITERAL("crashpad_test_test.exe"),
|
| - executable_name.value());
|
| -#else
|
| - EXPECT_EQ("crashpad_test_test", executable_name.value());
|
| -#endif // OS_WIN
|
| -}
|
| -
|
| -TEST(Paths, TestDataRoot) {
|
| - base::FilePath test_data_root = Paths::TestDataRoot();
|
| +TEST(TestPaths, TestDataRoot) {
|
| + base::FilePath test_data_root = TestPaths::TestDataRoot();
|
| ScopedFileHandle file(LoggingOpenFileForRead(
|
| test_data_root.Append(FILE_PATH_LITERAL("test"))
|
| - .Append(FILE_PATH_LITERAL("paths_test_data_root.txt"))));
|
| + .Append(FILE_PATH_LITERAL("test_paths_test_data_root.txt"))));
|
| EXPECT_TRUE(file.is_valid());
|
| }
|
|
|
|
|