| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "ash/test/test_suite.h" | 5 #include "ash/test/test_suite.h" |
| 6 | 6 |
| 7 #include "ash/common/ash_switches.h" | 7 #include "ash/common/ash_switches.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
| 10 #include "base/i18n/rtl.h" | 10 #include "base/i18n/rtl.h" |
| 11 #include "base/path_service.h" | 11 #include "base/path_service.h" |
| 12 #include "build/build_config.h" | 12 #include "build/build_config.h" |
| 13 #include "testing/gtest/include/gtest/gtest.h" | 13 #include "testing/gtest/include/gtest/gtest.h" |
| 14 #include "ui/aura/env.h" | 14 #include "ui/aura/env.h" |
| 15 #include "ui/base/resource/resource_bundle.h" | 15 #include "ui/base/resource/resource_bundle.h" |
| 16 #include "ui/base/ui_base_paths.h" | 16 #include "ui/base/ui_base_paths.h" |
| 17 #include "ui/gfx/gfx_paths.h" | 17 #include "ui/gfx/gfx_paths.h" |
| 18 #include "ui/gl/test/gl_surface_test_support.h" | 18 #include "ui/gl/test/gl_surface_test_support.h" |
| 19 | 19 |
| 20 #if defined(OS_WIN) | 20 #if defined(OS_WIN) |
| 21 #include "base/win/windows_version.h" | 21 #include "base/win/windows_version.h" |
| 22 #include "ui/base/win/atl_module.h" | 22 #include "ui/base/win/atl_module.h" |
| 23 #endif | 23 #endif |
| 24 | 24 |
| 25 namespace ash { | 25 namespace ash { |
| 26 namespace test { | 26 namespace test { |
| 27 | 27 |
| 28 AuraShellTestSuite::AuraShellTestSuite(int argc, char** argv) | 28 AuraShellTestSuite::AuraShellTestSuite(int argc, char** argv) |
| 29 : TestSuite(argc, argv) { | 29 : TestSuite(argc, argv) {} |
| 30 } | |
| 31 | 30 |
| 32 AuraShellTestSuite::~AuraShellTestSuite() { | 31 AuraShellTestSuite::~AuraShellTestSuite() {} |
| 33 } | |
| 34 | 32 |
| 35 void AuraShellTestSuite::Initialize() { | 33 void AuraShellTestSuite::Initialize() { |
| 36 base::TestSuite::Initialize(); | 34 base::TestSuite::Initialize(); |
| 37 gl::GLSurfaceTestSupport::InitializeOneOff(); | 35 gl::GLSurfaceTestSupport::InitializeOneOff(); |
| 38 | 36 |
| 39 #if defined(OS_WIN) | 37 #if defined(OS_WIN) |
| 40 base::win::Version version = base::win::GetVersion(); | 38 base::win::Version version = base::win::GetVersion(); |
| 41 // Although Ash officially is only supported for users on Win7+, we still run | 39 // Although Ash officially is only supported for users on Win7+, we still run |
| 42 // ash_unittests on Vista builders, so we still need to initialize COM. | 40 // ash_unittests on Vista builders, so we still need to initialize COM. |
| 43 if (version >= base::win::VERSION_VISTA && | 41 if (version >= base::win::VERSION_VISTA && |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 env_.reset(); | 77 env_.reset(); |
| 80 ui::ResourceBundle::CleanupSharedInstance(); | 78 ui::ResourceBundle::CleanupSharedInstance(); |
| 81 #if defined(OS_WIN) | 79 #if defined(OS_WIN) |
| 82 com_initializer_.reset(); | 80 com_initializer_.reset(); |
| 83 #endif | 81 #endif |
| 84 base::TestSuite::Shutdown(); | 82 base::TestSuite::Shutdown(); |
| 85 } | 83 } |
| 86 | 84 |
| 87 } // namespace test | 85 } // namespace test |
| 88 } // namespace ash | 86 } // namespace ash |
| OLD | NEW |