OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/test/ui/ui_test_suite.h" | 5 #include "chrome/test/ui/ui_test_suite.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/environment.h" | 10 #include "base/environment.h" |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
63 base::FilePath exe_dir; | 63 base::FilePath exe_dir; |
64 if (!PathService::Get(base::DIR_EXE, &exe_dir)) { | 64 if (!PathService::Get(base::DIR_EXE, &exe_dir)) { |
65 LOG(ERROR) << "Failed to get path to DIR_EXE, " | 65 LOG(ERROR) << "Failed to get path to DIR_EXE, " |
66 << "not starting crash_service.exe!"; | 66 << "not starting crash_service.exe!"; |
67 return; | 67 return; |
68 } | 68 } |
69 | 69 |
70 base::LaunchOptions launch_options; | 70 base::LaunchOptions launch_options; |
71 launch_options.job_handle = job_handle_.Get(); | 71 launch_options.job_handle = job_handle_.Get(); |
72 base::FilePath crash_service = exe_dir.Append(L"crash_service.exe"); | 72 base::FilePath crash_service = exe_dir.Append(L"crash_service.exe"); |
73 base::win::ScopedHandle crash_service_handle; | |
74 if (!base::LaunchProcess(crash_service.value(), base::LaunchOptions(), | 73 if (!base::LaunchProcess(crash_service.value(), base::LaunchOptions(), |
75 &crash_service_handle)) { | 74 &crash_service_)) { |
76 LOG(ERROR) << "Couldn't start crash_service.exe, so this ui_tests run " | 75 LOG(ERROR) << "Couldn't start crash_service.exe, so this ui_tests run " |
77 << "won't tell you if any test crashes!"; | 76 << "won't tell you if any test crashes!"; |
78 return; | 77 return; |
79 } | 78 } |
80 crash_service_ = crash_service_handle.Take(); | |
81 } | 79 } |
82 #endif | 80 #endif |
OLD | NEW |