Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(325)

Side by Side Diff: ash/test/test_suite.cc

Issue 14744016: Remove unnecessary ui::CompositorTestSupport (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add compositor_test_support dependency to ui/snapshot and ui/views test targets Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 "base/path_service.h" 10 #include "base/path_service.h"
11 #include "build/build_config.h" 11 #include "build/build_config.h"
12 #include "testing/gtest/include/gtest/gtest.h" 12 #include "testing/gtest/include/gtest/gtest.h"
13 #include "ui/base/resource/resource_bundle.h" 13 #include "ui/base/resource/resource_bundle.h"
14 #include "ui/base/ui_base_paths.h" 14 #include "ui/base/ui_base_paths.h"
15 #include "ui/compositor/compositor_setup.h" 15 #include "ui/compositor/compositor_setup.h"
16 #include "ui/compositor/test/compositor_test_support.h"
17 #include "ui/gfx/gfx_paths.h" 16 #include "ui/gfx/gfx_paths.h"
18 17
19 #if defined(OS_MACOSX) 18 #if defined(OS_MACOSX)
20 #include "ash/test/test_suite_init.h" 19 #include "ash/test/test_suite_init.h"
21 #endif 20 #endif
22 21
23 #if defined(OS_WIN) 22 #if defined(OS_WIN)
24 #include "base/win/windows_version.h" 23 #include "base/win/windows_version.h"
25 #include "ui/base/win/atl_module.h" 24 #include "ui/base/win/atl_module.h"
26 #include "win8/test/metro_registration_helper.h" 25 #include "win8/test/metro_registration_helper.h"
(...skipping 22 matching lines...) Expand all
49 gfx::RegisterPathProvider(); 48 gfx::RegisterPathProvider();
50 ui::RegisterPathProvider(); 49 ui::RegisterPathProvider();
51 50
52 #if defined(OS_MACOSX) 51 #if defined(OS_MACOSX)
53 ash::test::OverrideFrameworkBundle(); 52 ash::test::OverrideFrameworkBundle();
54 #endif 53 #endif
55 54
56 // Force unittests to run using en-US so if we test against string 55 // Force unittests to run using en-US so if we test against string
57 // output, it'll pass regardless of the system language. 56 // output, it'll pass regardless of the system language.
58 ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL); 57 ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
59 ui::CompositorTestSupport::Initialize();
60 ui::SetupTestCompositor(); 58 ui::SetupTestCompositor();
61 } 59 }
62 60
63 void AuraShellTestSuite::Shutdown() { 61 void AuraShellTestSuite::Shutdown() {
64 ui::CompositorTestSupport::Terminate();
65 ui::ResourceBundle::CleanupSharedInstance(); 62 ui::ResourceBundle::CleanupSharedInstance();
66 #if defined(OS_WIN) 63 #if defined(OS_WIN)
67 com_initializer_.reset(); 64 com_initializer_.reset();
68 #endif 65 #endif
69 base::TestSuite::Shutdown(); 66 base::TestSuite::Shutdown();
70 } 67 }
71 68
72 } // namespace test 69 } // namespace test
73 } // namespace ash 70 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell/content_client/shell_browser_main_parts.cc ('k') | ash/wm/session_state_controller_impl2_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698