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 334 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
345 | 345 |
346 // Start by replicating some of the steps that would otherwise be | 346 // Start by replicating some of the steps that would otherwise be |
347 // done by TestSuite::Initialize. We can't call the base class | 347 // done by TestSuite::Initialize. We can't call the base class |
348 // directly because it will attempt to initialize some things such as | 348 // directly because it will attempt to initialize some things such as |
349 // ICU that have already been initialized for this process. | 349 // ICU that have already been initialized for this process. |
350 CFUrlRequestUnittestRunner::InitializeLogging(); | 350 CFUrlRequestUnittestRunner::InitializeLogging(); |
351 base::Time::EnableHighResolutionTimer(true); | 351 base::Time::EnableHighResolutionTimer(true); |
352 | 352 |
353 SuppressErrorDialogs(); | 353 SuppressErrorDialogs(); |
354 base::debug::SetSuppressDebugUI(true); | 354 base::debug::SetSuppressDebugUI(true); |
355 #if !defined(PURIFY) | |
356 logging::SetLogAssertHandler(UnitTestAssertHandler); | 355 logging::SetLogAssertHandler(UnitTestAssertHandler); |
357 #endif // !defined(PURIFY) | |
358 | 356 |
359 // Next, do some initialization for NetTestSuite. | 357 // Next, do some initialization for NetTestSuite. |
360 NetTestSuite::InitializeTestThread(); | 358 NetTestSuite::InitializeTestThread(); |
361 } | 359 } |
362 | 360 |
363 void CFUrlRequestUnittestRunner::Shutdown() { | 361 void CFUrlRequestUnittestRunner::Shutdown() { |
364 DCHECK(::GetCurrentThreadId() == test_thread_id_); | 362 DCHECK(::GetCurrentThreadId() == test_thread_id_); |
365 NetTestSuite::Shutdown(); | 363 NetTestSuite::Shutdown(); |
366 OleUninitialize(); | 364 OleUninitialize(); |
367 } | 365 } |
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
573 FilterDisabledTests(); | 571 FilterDisabledTests(); |
574 test_suite.RunMainUIThread(); | 572 test_suite.RunMainUIThread(); |
575 | 573 |
576 if (crash_service) | 574 if (crash_service) |
577 base::KillProcess(crash_service, 0, false); | 575 base::KillProcess(crash_service, 0, false); |
578 | 576 |
579 base::KillProcesses(chrome_frame_test::kIEImageName, 0, NULL); | 577 base::KillProcesses(chrome_frame_test::kIEImageName, 0, NULL); |
580 base::KillProcesses(chrome_frame_test::kIEBrokerImageName, 0, NULL); | 578 base::KillProcesses(chrome_frame_test::kIEBrokerImageName, 0, NULL); |
581 return test_suite.test_result(); | 579 return test_suite.test_result(); |
582 } | 580 } |
OLD | NEW |