Index: chrome/test/mini_installer_test/chrome_mini_installer.cc |
=================================================================== |
--- chrome/test/mini_installer_test/chrome_mini_installer.cc (revision 70328) |
+++ chrome/test/mini_installer_test/chrome_mini_installer.cc (working copy) |
@@ -7,11 +7,11 @@ |
#include "base/command_line.h" |
#include "base/file_util.h" |
#include "base/path_service.h" |
-#include "base/platform_thread.h" |
#include "base/process.h" |
#include "base/process_util.h" |
#include "base/string_number_conversions.h" |
#include "base/string_util.h" |
+#include "base/threading/platform_thread.h" |
#include "base/win/registry.h" |
#include "chrome/installer/util/browser_distribution.h" |
#include "chrome/installer/util/google_update_constants.h" |
@@ -307,7 +307,7 @@ |
window_name = mini_installer_constants::kChromeUninstallDialogName; |
while (hndl == NULL && timer < 5000) { |
hndl = FindWindow(NULL, window_name.c_str()); |
- PlatformThread::Sleep(200); |
+ base::PlatformThread::Sleep(200); |
timer = timer + 200; |
} |
@@ -338,7 +338,7 @@ |
while (!handle && timer < 10000) { |
handle = FindWindowEx(NULL, handle, L"Chrome_WidgetWin_0", NULL); |
if (!handle) { |
- PlatformThread::Sleep(100); |
+ base::PlatformThread::Sleep(100); |
timer = timer + 100; |
} |
} |
@@ -348,7 +348,7 @@ |
LRESULT _result = SendMessage(handle, WM_CLOSE, 1, 0); |
if (_result != 0) |
return false; |
- PlatformThread::Sleep(1000); |
+ base::PlatformThread::Sleep(1000); |
timer = timer + 1000; |
} |
if (base::GetProcessCount(installer::kChromeExe, NULL) > 0) { |
@@ -382,7 +382,7 @@ |
int timer = 0; |
while ((key.Open(GetRootRegistryKey(), key_path.c_str(), KEY_ALL_ACCESS)) && |
(timer < 20000)) { |
- PlatformThread::Sleep(200); |
+ base::PlatformThread::Sleep(200); |
timer = timer + 200; |
} |
return CheckRegistryKey(key_path); |
@@ -601,7 +601,7 @@ |
MiniInstallerTestUtil::VerifyProcessLaunch( |
installer::kChromeExe, true); |
} |
- PlatformThread::Sleep(800); |
+ base::PlatformThread::Sleep(800); |
FindChromeShortcut(); |
LaunchAndCloseChrome(over_install); |
} |
@@ -645,7 +645,7 @@ |
bool expected_status) { |
base::LaunchApp(L"\"" + launch_path + L"\"" + L" " + launch_args, |
false, false, NULL); |
- PlatformThread::Sleep(1000); |
+ base::PlatformThread::Sleep(1000); |
MiniInstallerTestUtil::VerifyProcessLaunch(process_name.c_str(), |
expected_status); |
} |