| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 <exdisp.h> | 7 #include <exdisp.h> |
| 8 | 8 |
| 9 #include "app/app_paths.h" | 9 #include "app/app_paths.h" |
| 10 #include "app/resource_bundle.h" | 10 #include "app/resource_bundle.h" |
| (...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 322 logging::InitLogging(log_filename.value().c_str(), | 322 logging::InitLogging(log_filename.value().c_str(), |
| 323 logging::LOG_TO_BOTH_FILE_AND_SYSTEM_DEBUG_LOG, | 323 logging::LOG_TO_BOTH_FILE_AND_SYSTEM_DEBUG_LOG, |
| 324 logging::LOCK_LOG_FILE, | 324 logging::LOCK_LOG_FILE, |
| 325 logging::DELETE_OLD_LOG_FILE); | 325 logging::DELETE_OLD_LOG_FILE); |
| 326 // We want process and thread IDs because we may have multiple processes. | 326 // We want process and thread IDs because we may have multiple processes. |
| 327 // Note: temporarily enabled timestamps in an effort to catch bug 6361. | 327 // Note: temporarily enabled timestamps in an effort to catch bug 6361. |
| 328 logging::SetLogItems(true, true, true, true); | 328 logging::SetLogItems(true, true, true, true); |
| 329 } | 329 } |
| 330 | 330 |
| 331 void FilterDisabledTests() { | 331 void FilterDisabledTests() { |
| 332 if (::testing::FLAGS_gtest_filter.GetLength() && | 332 if (::testing::FLAGS_gtest_filter.length() && |
| 333 ::testing::FLAGS_gtest_filter.Compare("*") != 0) { | 333 ::testing::FLAGS_gtest_filter.Compare("*") != 0) { |
| 334 // Don't override user specified filters. | 334 // Don't override user specified filters. |
| 335 return; | 335 return; |
| 336 } | 336 } |
| 337 | 337 |
| 338 const char* disabled_tests[] = { | 338 const char* disabled_tests[] = { |
| 339 // Tests disabled since they're testing the same functionality used | 339 // Tests disabled since they're testing the same functionality used |
| 340 // by the TestAutomationProvider. | 340 // by the TestAutomationProvider. |
| 341 "URLRequestTest.InterceptNetworkError", | 341 "URLRequestTest.InterceptNetworkError", |
| 342 "URLRequestTest.InterceptRestartRequired", | 342 "URLRequestTest.InterceptRestartRequired", |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 382 DialogWatchdog watchdog; | 382 DialogWatchdog watchdog; |
| 383 // See url_request_unittest.cc for these credentials. | 383 // See url_request_unittest.cc for these credentials. |
| 384 SupplyProxyCredentials credentials("user", "secret"); | 384 SupplyProxyCredentials credentials("user", "secret"); |
| 385 watchdog.AddObserver(&credentials); | 385 watchdog.AddObserver(&credentials); |
| 386 testing::InitGoogleTest(&argc, argv); | 386 testing::InitGoogleTest(&argc, argv); |
| 387 FilterDisabledTests(); | 387 FilterDisabledTests(); |
| 388 CFUrlRequestUnittestRunner test_suite(argc, argv); | 388 CFUrlRequestUnittestRunner test_suite(argc, argv); |
| 389 test_suite.RunMainUIThread(); | 389 test_suite.RunMainUIThread(); |
| 390 return 0; | 390 return 0; |
| 391 } | 391 } |
| OLD | NEW |