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

Side by Side Diff: ui/aura/test/test_suite.cc

Issue 8240006: Use a mocked compositor for unit tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge Created 9 years, 1 month 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) 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 "ui/aura/test/test_suite.h" 5 #include "ui/aura/test/test_suite.h"
6 6
7 #include "base/file_path.h" 7 #include "base/file_path.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "build/build_config.h" 9 #include "build/build_config.h"
10 #include "ui/base/resource/resource_bundle.h" 10 #include "ui/base/resource/resource_bundle.h"
(...skipping 11 matching lines...) Expand all
22 void AuraTestSuite::Initialize() { 22 void AuraTestSuite::Initialize() {
23 base::TestSuite::Initialize(); 23 base::TestSuite::Initialize();
24 24
25 gfx::RegisterPathProvider(); 25 gfx::RegisterPathProvider();
26 ui::RegisterPathProvider(); 26 ui::RegisterPathProvider();
27 27
28 // Force unittests to run using en-US so if we test against string 28 // Force unittests to run using en-US so if we test against string
29 // output, it'll pass regardless of the system language. 29 // output, it'll pass regardless of the system language.
30 ui::ResourceBundle::InitSharedInstance("en-US"); 30 ui::ResourceBundle::InitSharedInstance("en-US");
31 ui::CompositorTestSupport::Initialize(); 31 ui::CompositorTestSupport::Initialize();
32 ui::CompositorTestSupport::SetupMockCompositor();
32 } 33 }
33 34
34 void AuraTestSuite::Shutdown() { 35 void AuraTestSuite::Shutdown() {
35 ui::CompositorTestSupport::Terminate(); 36 ui::CompositorTestSupport::Terminate();
36 ui::ResourceBundle::CleanupSharedInstance(); 37 ui::ResourceBundle::CleanupSharedInstance();
37 38
38 base::TestSuite::Shutdown(); 39 base::TestSuite::Shutdown();
39 } 40 }
40 41
41 } // namespace test 42 } // namespace test
42 } // namespace aura 43 } // namespace aura
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698