| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/mini_installer_test_util.h" | 5 #include "chrome/test/mini_installer_test/mini_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/platform_thread.h" | 9 #include "base/platform_thread.h" |
| 10 #include "base/process_util.h" | 10 #include "base/process_util.h" |
| 11 #include "base/string_util.h" |
| 11 #include "base/time.h" | 12 #include "base/time.h" |
| 12 #include "base/utf_string_conversions.h" | 13 #include "base/utf_string_conversions.h" |
| 13 #include "chrome/installer/util/logging_installer.h" | 14 #include "chrome/installer/util/logging_installer.h" |
| 14 #include "chrome/test/mini_installer_test/mini_installer_test_constants.h" | 15 #include "chrome/test/mini_installer_test/mini_installer_test_constants.h" |
| 15 #include "testing/gtest/include/gtest/gtest.h" | 16 #include "testing/gtest/include/gtest/gtest.h" |
| 16 | 17 |
| 17 // Change current directory so that chrome.dll from current folder | 18 // Change current directory so that chrome.dll from current folder |
| 18 // will not be used as fall back. | 19 // will not be used as fall back. |
| 19 bool MiniInstallerTestUtil::ChangeCurrentDirectory(FilePath* current_path) { | 20 bool MiniInstallerTestUtil::ChangeCurrentDirectory(FilePath* current_path) { |
| 20 FilePath backup_path; | 21 FilePath backup_path; |
| (...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 295 (timer < 60000)) { | 296 (timer < 60000)) { |
| 296 PlatformThread::Sleep(200); | 297 PlatformThread::Sleep(200); |
| 297 timer = timer + 200; | 298 timer = timer + 200; |
| 298 } | 299 } |
| 299 } else { | 300 } else { |
| 300 if (base::GetProcessCount(process_name, NULL) != 0) | 301 if (base::GetProcessCount(process_name, NULL) != 0) |
| 301 return false; | 302 return false; |
| 302 } | 303 } |
| 303 return true; | 304 return true; |
| 304 } | 305 } |
| OLD | NEW |