Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(270)

Side by Side Diff: chrome/test/mini_installer_test/chrome_mini_installer.cc

Issue 93020: Revert "try enabling installer tests again." (Closed)
Patch Set: Created 11 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/test/mini_installer_test/test.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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/chrome_mini_installer.h" 5 #include "chrome/test/mini_installer_test/chrome_mini_installer.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/platform_thread.h" 10 #include "base/platform_thread.h"
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 if (hndl != NULL) { 235 if (hndl != NULL) {
236 LRESULT _result = SendMessage(hndl, message, 1, 0); 236 LRESULT _result = SendMessage(hndl, message, 1, 0);
237 return_val = true; 237 return_val = true;
238 } 238 }
239 return return_val; 239 return return_val;
240 } 240 }
241 241
242 bool ChromeMiniInstaller::CloseUninstallWindow() { 242 bool ChromeMiniInstaller::CloseUninstallWindow() {
243 HWND hndl = NULL; 243 HWND hndl = NULL;
244 int timer = 0; 244 int timer = 0;
245 while (hndl == NULL && timer < 60000) { 245 while (hndl == NULL && timer < 5000) {
246 hndl = FindWindow(NULL, 246 hndl = FindWindow(NULL,
247 mini_installer_constants::kChromeUninstallDialogName); 247 mini_installer_constants::kChromeUninstallDialogName);
248 PlatformThread::Sleep(200); 248 PlatformThread::Sleep(200);
249 timer = timer + 200; 249 timer = timer + 200;
250 } 250 }
251 251
252 if (hndl == NULL) 252 if (hndl == NULL)
253 hndl = FindWindow(NULL, mini_installer_constants::kChromeBuildType); 253 hndl = FindWindow(NULL, mini_installer_constants::kChromeBuildType);
254 254
255 if (hndl == NULL) 255 if (hndl == NULL)
(...skipping 398 matching lines...) Expand 10 before | Expand all | Expand 10 after
654 const wchar_t* process_name) { 654 const wchar_t* process_name) {
655 int timer = 0; 655 int timer = 0;
656 printf("\nWaiting for this process to end... %ls\n", process_name); 656 printf("\nWaiting for this process to end... %ls\n", process_name);
657 while ((base::GetProcessCount(process_name, NULL) > 0) && 657 while ((base::GetProcessCount(process_name, NULL) > 0) &&
658 (timer < 60000)) { 658 (timer < 60000)) {
659 PlatformThread::Sleep(200); 659 PlatformThread::Sleep(200);
660 timer = timer + 200; 660 timer = timer + 200;
661 } 661 }
662 ASSERT_EQ(0, base::GetProcessCount(process_name, NULL)); 662 ASSERT_EQ(0, base::GetProcessCount(process_name, NULL));
663 } 663 }
OLDNEW
« no previous file with comments | « no previous file | chrome/test/mini_installer_test/test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698