| Index: base/test/test_suite.cc
|
| diff --git a/base/test/test_suite.cc b/base/test/test_suite.cc
|
| index e281cff3da288f8f333f370a9f3a2fc6f668b7a4..255a539b8b07ff31f79251d486edcafcc4795b4e 100644
|
| --- a/base/test/test_suite.cc
|
| +++ b/base/test/test_suite.cc
|
| @@ -36,13 +36,11 @@
|
| #endif // OS_IOS
|
| #endif // OS_MACOSX
|
|
|
| -#if !defined(OS_WIN)
|
| #include "base/i18n/rtl.h"
|
| #if !defined(OS_IOS)
|
| #include "base/strings/string_util.h"
|
| #include "third_party/icu/source/common/unicode/uloc.h"
|
| #endif
|
| -#endif
|
|
|
| #if defined(OS_ANDROID)
|
| #include "base/test/test_support_android.h"
|
| @@ -99,14 +97,6 @@ TestSuite::TestSuite(int argc, char** argv) : initialized_command_line_(false) {
|
| InitializeFromCommandLine(argc, argv);
|
| }
|
|
|
| -#if defined(OS_WIN)
|
| -TestSuite::TestSuite(int argc, wchar_t** argv)
|
| - : initialized_command_line_(false) {
|
| - PreInitialize(true);
|
| - InitializeFromCommandLine(argc, argv);
|
| -}
|
| -#endif // defined(OS_WIN)
|
| -
|
| TestSuite::TestSuite(int argc, char** argv, bool create_at_exit_manager)
|
| : initialized_command_line_(false) {
|
| PreInitialize(create_at_exit_manager);
|
| @@ -128,19 +118,7 @@ void TestSuite::InitializeFromCommandLine(int argc, char** argv) {
|
| #endif
|
| }
|
|
|
| -#if defined(OS_WIN)
|
| -void TestSuite::InitializeFromCommandLine(int argc, wchar_t** argv) {
|
| - // Windows CommandLine::Init ignores argv anyway.
|
| - initialized_command_line_ = CommandLine::Init(argc, NULL);
|
| - testing::InitGoogleTest(&argc, argv);
|
| - testing::InitGoogleMock(&argc, argv);
|
| -}
|
| -#endif // defined(OS_WIN)
|
| -
|
| void TestSuite::PreInitialize(bool create_at_exit_manager) {
|
| -#if defined(OS_WIN)
|
| - testing::GTEST_FLAG(catch_exceptions) = false;
|
| -#endif
|
| EnableTerminationOnHeapCorruption();
|
| #if defined(OS_LINUX) && defined(USE_AURA)
|
| // When calling native char conversion functions (e.g wrctomb) we need to
|
| @@ -262,24 +240,6 @@ void TestSuite::UnitTestAssertHandler(const std::string& str) {
|
| }
|
|
|
| void TestSuite::SuppressErrorDialogs() {
|
| -#if defined(OS_WIN)
|
| - UINT new_flags = SEM_FAILCRITICALERRORS |
|
| - SEM_NOGPFAULTERRORBOX |
|
| - SEM_NOOPENFILEERRORBOX;
|
| -
|
| - // Preserve existing error mode, as discussed at
|
| - // http://blogs.msdn.com/oldnewthing/archive/2004/07/27/198410.aspx
|
| - UINT existing_flags = SetErrorMode(new_flags);
|
| - SetErrorMode(existing_flags | new_flags);
|
| -
|
| -#if defined(_DEBUG) && defined(_HAS_EXCEPTIONS) && (_HAS_EXCEPTIONS == 1)
|
| - // Suppress the "Debug Assertion Failed" dialog.
|
| - // TODO(hbono): remove this code when gtest has it.
|
| - // http://groups.google.com/d/topic/googletestframework/OjuwNlXy5ac/discussion
|
| - _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG);
|
| - _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);
|
| -#endif // defined(_DEBUG) && defined(_HAS_EXCEPTIONS) && (_HAS_EXCEPTIONS == 1)
|
| -#endif // defined(OS_WIN)
|
| }
|
|
|
| void TestSuite::Initialize() {
|
| @@ -311,11 +271,6 @@ void TestSuite::Initialize() {
|
| #endif // else defined(OS_ANDROID)
|
|
|
| CHECK(debug::EnableInProcessStackDumping());
|
| -#if defined(OS_WIN)
|
| - // Make sure we run with high resolution timer to minimize differences
|
| - // between production code and test code.
|
| - Time::EnableHighResolutionTimer(true);
|
| -#endif // defined(OS_WIN)
|
|
|
| // In some cases, we do not want to see standard error dialogs.
|
| if (!debug::BeingDebugged() &&
|
| @@ -333,7 +288,6 @@ void TestSuite::Initialize() {
|
| // does not affect tests that explicitly overrides the locale for testing.
|
| // This can be an issue on all platforms other than Windows.
|
| // TODO(jshin): Should we set the locale via an OS X locale API here?
|
| -#if !defined(OS_WIN)
|
| #if defined(OS_IOS)
|
| i18n::SetICUDefaultLocale("en_US");
|
| #else
|
| @@ -341,7 +295,6 @@ void TestSuite::Initialize() {
|
| if (EndsWith(default_locale, "POSIX", false))
|
| i18n::SetICUDefaultLocale("en_US");
|
| #endif
|
| -#endif
|
|
|
| CatchMaybeTests();
|
| ResetCommandLine();
|
|
|