OLD | NEW |
1 // Copyright 2015 The Crashpad Authors. All rights reserved. | 1 // Copyright 2015 The Crashpad Authors. All rights reserved. |
2 // | 2 // |
3 // Licensed under the Apache License, Version 2.0 (the "License"); | 3 // Licensed under the Apache License, Version 2.0 (the "License"); |
4 // you may not use this file except in compliance with the License. | 4 // you may not use this file except in compliance with the License. |
5 // You may obtain a copy of the License at | 5 // You may obtain a copy of the License at |
6 // | 6 // |
7 // http://www.apache.org/licenses/LICENSE-2.0 | 7 // http://www.apache.org/licenses/LICENSE-2.0 |
8 // | 8 // |
9 // Unless required by applicable law or agreed to in writing, software | 9 // Unless required by applicable law or agreed to in writing, software |
10 // distributed under the License is distributed on an "AS IS" BASIS, | 10 // distributed under the License is distributed on an "AS IS" BASIS, |
(...skipping 13 matching lines...) Expand all Loading... |
24 #include "test/win/child_launcher.h" | 24 #include "test/win/child_launcher.h" |
25 #include "util/file/file_io.h" | 25 #include "util/file/file_io.h" |
26 #include "util/win/scoped_handle.h" | 26 #include "util/win/scoped_handle.h" |
27 #include "util/win/scoped_process_suspend.h" | 27 #include "util/win/scoped_process_suspend.h" |
28 | 28 |
29 namespace crashpad { | 29 namespace crashpad { |
30 namespace test { | 30 namespace test { |
31 namespace { | 31 namespace { |
32 | 32 |
33 void TestImageReaderChild(const base::string16& directory_modification) { | 33 void TestImageReaderChild(const base::string16& directory_modification) { |
34 UUID done_uuid(UUID::InitializeWithNewTag{}); | 34 UUID done_uuid; |
| 35 done_uuid.InitializeWithNew(); |
35 ScopedKernelHANDLE done( | 36 ScopedKernelHANDLE done( |
36 CreateEvent(nullptr, true, false, done_uuid.ToString16().c_str())); | 37 CreateEvent(nullptr, true, false, done_uuid.ToString16().c_str())); |
37 ASSERT_TRUE(done.get()); | 38 ASSERT_TRUE(done.get()); |
38 | 39 |
39 base::FilePath test_executable = Paths::Executable(); | 40 base::FilePath test_executable = Paths::Executable(); |
40 std::wstring child_test_executable = | 41 std::wstring child_test_executable = |
41 test_executable.DirName() | 42 test_executable.DirName() |
42 .Append(directory_modification) | 43 .Append(directory_modification) |
43 .Append(test_executable.BaseName().RemoveFinalExtension().value() + | 44 .Append(test_executable.BaseName().RemoveFinalExtension().value() + |
44 L"_image_reader.exe") | 45 L"_image_reader.exe") |
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
115 TestImageReaderChild(FILE_PATH_LITERAL("..\\..\\out\\Debug")); | 116 TestImageReaderChild(FILE_PATH_LITERAL("..\\..\\out\\Debug")); |
116 #else | 117 #else |
117 TestImageReaderChild(FILE_PATH_LITERAL("..\\..\\out\\Release")); | 118 TestImageReaderChild(FILE_PATH_LITERAL("..\\..\\out\\Release")); |
118 #endif | 119 #endif |
119 } | 120 } |
120 #endif | 121 #endif |
121 | 122 |
122 } // namespace | 123 } // namespace |
123 } // namespace test | 124 } // namespace test |
124 } // namespace crashpad | 125 } // namespace crashpad |
OLD | NEW |