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 421 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
432 | 432 |
433 void CFUrlRequestUnittestRunner::InitializeLogging() { | 433 void CFUrlRequestUnittestRunner::InitializeLogging() { |
434 FilePath exe; | 434 FilePath exe; |
435 PathService::Get(base::FILE_EXE, &exe); | 435 PathService::Get(base::FILE_EXE, &exe); |
436 FilePath log_filename = exe.ReplaceExtension(FILE_PATH_LITERAL("log")); | 436 FilePath log_filename = exe.ReplaceExtension(FILE_PATH_LITERAL("log")); |
437 logging::InitLogging( | 437 logging::InitLogging( |
438 log_filename.value().c_str(), | 438 log_filename.value().c_str(), |
439 logging::LOG_TO_BOTH_FILE_AND_SYSTEM_DEBUG_LOG, | 439 logging::LOG_TO_BOTH_FILE_AND_SYSTEM_DEBUG_LOG, |
440 logging::LOCK_LOG_FILE, | 440 logging::LOCK_LOG_FILE, |
441 logging::DELETE_OLD_LOG_FILE, | 441 logging::DELETE_OLD_LOG_FILE, |
442 logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS); | 442 logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS, |
| 443 logging::DISABLE_DLOG_FOR_NON_OFFICIAL_RELEASE_BUILDS); |
443 // We want process and thread IDs because we may have multiple processes. | 444 // We want process and thread IDs because we may have multiple processes. |
444 // Note: temporarily enabled timestamps in an effort to catch bug 6361. | 445 // Note: temporarily enabled timestamps in an effort to catch bug 6361. |
445 logging::SetLogItems(true, true, true, true); | 446 logging::SetLogItems(true, true, true, true); |
446 } | 447 } |
447 | 448 |
448 void FilterDisabledTests() { | 449 void FilterDisabledTests() { |
449 if (::testing::FLAGS_gtest_filter.length() && | 450 if (::testing::FLAGS_gtest_filter.length() && |
450 ::testing::FLAGS_gtest_filter.Compare("*") != 0) { | 451 ::testing::FLAGS_gtest_filter.Compare("*") != 0) { |
451 // Don't override user specified filters. | 452 // Don't override user specified filters. |
452 return; | 453 return; |
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
594 base::KillProcesses(chrome_frame_test::kIEImageName, 0, NULL); | 595 base::KillProcesses(chrome_frame_test::kIEImageName, 0, NULL); |
595 base::KillProcesses(chrome_frame_test::kIEBrokerImageName, 0, NULL); | 596 base::KillProcesses(chrome_frame_test::kIEBrokerImageName, 0, NULL); |
596 // Avoid CRT cleanup in debug test runs to ensure that webkit ASSERTs which | 597 // Avoid CRT cleanup in debug test runs to ensure that webkit ASSERTs which |
597 // check if globals are created and destroyed on the same thread don't fire. | 598 // check if globals are created and destroyed on the same thread don't fire. |
598 // Webkit global objects are created on the inproc renderer thread. | 599 // Webkit global objects are created on the inproc renderer thread. |
599 #if !defined(NDEBUG) | 600 #if !defined(NDEBUG) |
600 ExitProcess(test_suite.test_result()); | 601 ExitProcess(test_suite.test_result()); |
601 #endif // NDEBUG | 602 #endif // NDEBUG |
602 return test_suite.test_result(); | 603 return test_suite.test_result(); |
603 } | 604 } |
OLD | NEW |