| 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/ash_switches.h" | 7 #include "ash/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 "build/build_config.h" | 10 #include "build/build_config.h" |
| 11 #include "testing/gtest/include/gtest/gtest.h" | 11 #include "testing/gtest/include/gtest/gtest.h" |
| 12 #include "ui/base/resource/resource_bundle.h" | 12 #include "ui/base/resource/resource_bundle.h" |
| 13 #include "ui/base/ui_base_paths.h" | 13 #include "ui/base/ui_base_paths.h" |
| 14 #include "ui/gfx/gfx_paths.h" | 14 #include "ui/gfx/gfx_paths.h" |
| 15 #include "ui/gl/gl_surface.h" | 15 #include "ui/gl/gl_surface.h" |
| 16 | 16 |
| 17 #if defined(OS_WIN) | 17 #if defined(OS_WIN) |
| 18 #include "base/win/windows_version.h" | 18 #include "base/win/windows_version.h" |
| 19 #include "ui/base/win/atl_module.h" | 19 #include "ui/base/win/atl_module.h" |
| 20 #include "win8/test/metro_registration_helper.h" | 20 #include "win8/test/metro_registration_helper.h" |
| 21 #include "win8/test/test_registrar_constants.h" | 21 #include "win8/test/test_registrar_constants.h" |
| 22 #endif | 22 #endif |
| 23 | 23 |
| 24 namespace ash { | 24 namespace ash { |
| 25 namespace test { | 25 namespace test { |
| 26 | 26 |
| 27 AuraShellTestSuite::AuraShellTestSuite(int argc, char** argv) | 27 AuraShellTestSuite::AuraShellTestSuite(int argc, char** argv) |
| 28 : TestSuite(argc, argv) {} | 28 : TestSuite(argc, argv) { |
| 29 } |
| 30 |
| 31 AuraShellTestSuite::~AuraShellTestSuite() { |
| 32 } |
| 29 | 33 |
| 30 void AuraShellTestSuite::Initialize() { | 34 void AuraShellTestSuite::Initialize() { |
| 31 base::TestSuite::Initialize(); | 35 base::TestSuite::Initialize(); |
| 32 gfx::GLSurface::InitializeOneOffForTests(); | 36 gfx::GLSurface::InitializeOneOffForTests(); |
| 33 | 37 |
| 34 #if defined(OS_WIN) | 38 #if defined(OS_WIN) |
| 35 base::win::Version version = base::win::GetVersion(); | 39 base::win::Version version = base::win::GetVersion(); |
| 36 // Although Ash officially is only supported for users on Win7+, we still run | 40 // Although Ash officially is only supported for users on Win7+, we still run |
| 37 // ash_unittests on Vista builders, so we still need to initialize COM. | 41 // ash_unittests on Vista builders, so we still need to initialize COM. |
| 38 if (version >= base::win::VERSION_VISTA && | 42 if (version >= base::win::VERSION_VISTA && |
| (...skipping 20 matching lines...) Expand all Loading... |
| 59 void AuraShellTestSuite::Shutdown() { | 63 void AuraShellTestSuite::Shutdown() { |
| 60 ui::ResourceBundle::CleanupSharedInstance(); | 64 ui::ResourceBundle::CleanupSharedInstance(); |
| 61 #if defined(OS_WIN) | 65 #if defined(OS_WIN) |
| 62 com_initializer_.reset(); | 66 com_initializer_.reset(); |
| 63 #endif | 67 #endif |
| 64 base::TestSuite::Shutdown(); | 68 base::TestSuite::Shutdown(); |
| 65 } | 69 } |
| 66 | 70 |
| 67 } // namespace test | 71 } // namespace test |
| 68 } // namespace ash | 72 } // namespace ash |
| OLD | NEW |