OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/mini_installer_test/installer_test_util.h" | 5 #include "chrome/test/mini_installer_test/installer_test_util.h" |
6 | 6 |
7 #include "base/file_util.h" | 7 #include "base/file_util.h" |
8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
9 #include "base/process.h" | 9 #include "base/process/kill.h" |
10 #include "base/process_util.h" | 10 #include "base/process/launch.h" |
| 11 #include "base/process/process.h" |
11 #include "base/strings/string_util.h" | 12 #include "base/strings/string_util.h" |
12 #include "base/threading/platform_thread.h" | 13 #include "base/threading/platform_thread.h" |
13 #include "chrome/common/chrome_result_codes.h" | 14 #include "chrome/common/chrome_result_codes.h" |
14 #include "chrome/installer/util/google_update_constants.h" | 15 #include "chrome/installer/util/google_update_constants.h" |
15 #include "chrome/installer/util/helper.h" | 16 #include "chrome/installer/util/helper.h" |
16 #include "chrome/installer/util/install_util.h" | 17 #include "chrome/installer/util/install_util.h" |
17 #include "chrome/installer/util/util_constants.h" | 18 #include "chrome/installer/util/util_constants.h" |
18 #include "chrome/test/mini_installer_test/mini_installer_test_constants.h" | 19 #include "chrome/test/mini_installer_test/mini_installer_test_constants.h" |
19 #include "testing/gtest/include/gtest/gtest.h" | 20 #include "testing/gtest/include/gtest/gtest.h" |
20 | 21 |
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
291 return false; | 292 return false; |
292 } | 293 } |
293 if (!base::WaitForSingleProcess(process, base::TimeDelta::FromMinutes(1))) { | 294 if (!base::WaitForSingleProcess(process, base::TimeDelta::FromMinutes(1))) { |
294 LOG(ERROR) << "Launched process did not complete."; | 295 LOG(ERROR) << "Launched process did not complete."; |
295 return false; | 296 return false; |
296 } | 297 } |
297 return true; | 298 return true; |
298 } | 299 } |
299 | 300 |
300 } // namespace | 301 } // namespace |
OLD | NEW |