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_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 365 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
376 if (PromptAfterSetup()) | 376 if (PromptAfterSetup()) |
377 MessageBoxA(NULL, "click ok to exit", "", MB_OK); | 377 MessageBoxA(NULL, "click ok to exit", "", MB_OK); |
378 | 378 |
379 me->ShutDownHostBrowser(); | 379 me->ShutDownHostBrowser(); |
380 } | 380 } |
381 | 381 |
382 void CFUrlRequestUnittestRunner::InitializeLogging() { | 382 void CFUrlRequestUnittestRunner::InitializeLogging() { |
383 FilePath exe; | 383 FilePath exe; |
384 PathService::Get(base::FILE_EXE, &exe); | 384 PathService::Get(base::FILE_EXE, &exe); |
385 FilePath log_filename = exe.ReplaceExtension(FILE_PATH_LITERAL("log")); | 385 FilePath log_filename = exe.ReplaceExtension(FILE_PATH_LITERAL("log")); |
386 logging::InitLogging( | 386 logging::InitLogging(log_filename.value().c_str(), |
387 log_filename.value().c_str(), | 387 logging::LOG_TO_BOTH_FILE_AND_SYSTEM_DEBUG_LOG, |
388 logging::LOG_TO_BOTH_FILE_AND_SYSTEM_DEBUG_LOG, | 388 logging::LOCK_LOG_FILE, |
389 logging::LOCK_LOG_FILE, | 389 logging::DELETE_OLD_LOG_FILE); |
390 logging::DELETE_OLD_LOG_FILE, | |
391 logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS); | |
392 // We want process and thread IDs because we may have multiple processes. | 390 // We want process and thread IDs because we may have multiple processes. |
393 // Note: temporarily enabled timestamps in an effort to catch bug 6361. | 391 // Note: temporarily enabled timestamps in an effort to catch bug 6361. |
394 logging::SetLogItems(true, true, true, true); | 392 logging::SetLogItems(true, true, true, true); |
395 } | 393 } |
396 | 394 |
397 void FilterDisabledTests() { | 395 void FilterDisabledTests() { |
398 if (::testing::FLAGS_gtest_filter.length() && | 396 if (::testing::FLAGS_gtest_filter.length() && |
399 ::testing::FLAGS_gtest_filter.Compare("*") != 0) { | 397 ::testing::FLAGS_gtest_filter.Compare("*") != 0) { |
400 // Don't override user specified filters. | 398 // Don't override user specified filters. |
401 return; | 399 return; |
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
495 // See url_request_unittest.cc for these credentials. | 493 // See url_request_unittest.cc for these credentials. |
496 SupplyProxyCredentials credentials("user", "secret"); | 494 SupplyProxyCredentials credentials("user", "secret"); |
497 watchdog.AddObserver(&credentials, "Windows Security", ""); | 495 watchdog.AddObserver(&credentials, "Windows Security", ""); |
498 testing::InitGoogleTest(&argc, argv); | 496 testing::InitGoogleTest(&argc, argv); |
499 FilterDisabledTests(); | 497 FilterDisabledTests(); |
500 PluginService::EnableChromePlugins(false); | 498 PluginService::EnableChromePlugins(false); |
501 CFUrlRequestUnittestRunner test_suite(argc, argv); | 499 CFUrlRequestUnittestRunner test_suite(argc, argv); |
502 test_suite.RunMainUIThread(); | 500 test_suite.RunMainUIThread(); |
503 return 0; | 501 return 0; |
504 } | 502 } |
OLD | NEW |