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_frame/test/net/fake_external_tab.h" | 5 #include "chrome_frame/test/net/fake_external_tab.h" |
6 | 6 |
7 #include <atlbase.h> | 7 #include <atlbase.h> |
8 #include <atlcom.h> | 8 #include <atlcom.h> |
9 #include <exdisp.h> | 9 #include <exdisp.h> |
10 | 10 |
(...skipping 433 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
444 } | 444 } |
445 | 445 |
446 // static | 446 // static |
447 void CFUrlRequestUnittestRunner::TakeDownBrowser( | 447 void CFUrlRequestUnittestRunner::TakeDownBrowser( |
448 CFUrlRequestUnittestRunner* me) { | 448 CFUrlRequestUnittestRunner* me) { |
449 if (PromptAfterSetup()) | 449 if (PromptAfterSetup()) |
450 MessageBoxA(NULL, "click ok to exit", "", MB_OK); | 450 MessageBoxA(NULL, "click ok to exit", "", MB_OK); |
451 | 451 |
452 me->ShutDownHostBrowser(); | 452 me->ShutDownHostBrowser(); |
453 me->fake_chrome_.ui_loop()->PostDelayedTask(FROM_HERE, | 453 me->fake_chrome_.ui_loop()->PostDelayedTask(FROM_HERE, |
454 new MessageLoop::QuitTask, | 454 MessageLoop::QuitClosure(), |
455 TestTimeouts::tiny_timeout_ms()); | 455 TestTimeouts::tiny_timeout_ms()); |
456 } | 456 } |
457 | 457 |
458 void CFUrlRequestUnittestRunner::InitializeLogging() { | 458 void CFUrlRequestUnittestRunner::InitializeLogging() { |
459 FilePath exe; | 459 FilePath exe; |
460 PathService::Get(base::FILE_EXE, &exe); | 460 PathService::Get(base::FILE_EXE, &exe); |
461 FilePath log_filename = exe.ReplaceExtension(FILE_PATH_LITERAL("log")); | 461 FilePath log_filename = exe.ReplaceExtension(FILE_PATH_LITERAL("log")); |
462 logging::InitLogging( | 462 logging::InitLogging( |
463 log_filename.value().c_str(), | 463 log_filename.value().c_str(), |
464 logging::LOG_TO_BOTH_FILE_AND_SYSTEM_DEBUG_LOG, | 464 logging::LOG_TO_BOTH_FILE_AND_SYSTEM_DEBUG_LOG, |
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
652 base::KillProcesses(chrome_frame_test::kIEImageName, 0, NULL); | 652 base::KillProcesses(chrome_frame_test::kIEImageName, 0, NULL); |
653 base::KillProcesses(chrome_frame_test::kIEBrokerImageName, 0, NULL); | 653 base::KillProcesses(chrome_frame_test::kIEBrokerImageName, 0, NULL); |
654 // Avoid CRT cleanup in debug test runs to ensure that webkit ASSERTs which | 654 // Avoid CRT cleanup in debug test runs to ensure that webkit ASSERTs which |
655 // check if globals are created and destroyed on the same thread don't fire. | 655 // check if globals are created and destroyed on the same thread don't fire. |
656 // Webkit global objects are created on the inproc renderer thread. | 656 // Webkit global objects are created on the inproc renderer thread. |
657 #if !defined(NDEBUG) | 657 #if !defined(NDEBUG) |
658 ExitProcess(test_suite.test_result()); | 658 ExitProcess(test_suite.test_result()); |
659 #endif // NDEBUG | 659 #endif // NDEBUG |
660 return test_suite.test_result(); | 660 return test_suite.test_result(); |
661 } | 661 } |
OLD | NEW |