| Index: util/thread/thread_win.cc
 | 
| diff --git a/test/thread_win.cc b/util/thread/thread_win.cc
 | 
| similarity index 76%
 | 
| rename from test/thread_win.cc
 | 
| rename to util/thread/thread_win.cc
 | 
| index 05c67ea8875ffe6b72f129e60a0d60781a78bee4..c4ac1eb784d1f80bfcb066987a934c0c6df0eb67 100644
 | 
| --- a/test/thread_win.cc
 | 
| +++ b/util/thread/thread_win.cc
 | 
| @@ -12,25 +12,23 @@
 | 
|  // See the License for the specific language governing permissions and
 | 
|  // limitations under the License.
 | 
|  
 | 
| -#include "test/thread.h"
 | 
| +#include "util/thread/thread.h"
 | 
|  
 | 
| -#include "gtest/gtest.h"
 | 
| -#include "test/errors.h"
 | 
| +#include "base/logging.h"
 | 
|  
 | 
|  namespace crashpad {
 | 
| -namespace test {
 | 
|  
 | 
|  void Thread::Start() {
 | 
| -  ASSERT_FALSE(platform_thread_);
 | 
| +  DCHECK(!platform_thread_);
 | 
|    platform_thread_ =
 | 
|        CreateThread(nullptr, 0, ThreadEntryThunk, this, 0, nullptr);
 | 
| -  ASSERT_TRUE(platform_thread_) << ErrorMessage("CreateThread");
 | 
| +  PCHECK(platform_thread_);
 | 
|  }
 | 
|  
 | 
|  void Thread::Join() {
 | 
| -  ASSERT_TRUE(platform_thread_);
 | 
| +  DCHECK(platform_thread_);
 | 
|    DWORD result = WaitForSingleObject(platform_thread_, INFINITE);
 | 
| -  EXPECT_EQ(WAIT_OBJECT_0, result) << ErrorMessage("WaitForSingleObject");
 | 
| +  PCHECK(WAIT_OBJECT_0 == result);
 | 
|    platform_thread_ = 0;
 | 
|  }
 | 
|  
 | 
| @@ -41,5 +39,4 @@ DWORD WINAPI Thread::ThreadEntryThunk(void* argument) {
 | 
|    return 0;
 | 
|  }
 | 
|  
 | 
| -}  // namespace test
 | 
|  }  // namespace crashpad
 | 
| 
 |