| Index: ui/aura/test/test_suite.cc
|
| diff --git a/ui/aura/test/test_suite.cc b/ui/aura/test/test_suite.cc
|
| index e487c9b6020da9d9c5ea0469539215a1fabf7546..5b76a17f73f0d71b9e3e157c416d014afaf241cf 100644
|
| --- a/ui/aura/test/test_suite.cc
|
| +++ b/ui/aura/test/test_suite.cc
|
| @@ -10,7 +10,6 @@
|
| #include "ui/base/resource/resource_bundle.h"
|
| #include "ui/base/ui_base_paths.h"
|
| #include "ui/compositor/compositor_setup.h"
|
| -#include "ui/compositor/test/compositor_test_support.h"
|
| #include "ui/gfx/gfx_paths.h"
|
| #include "ui/gl/gl_implementation.h"
|
|
|
| @@ -29,13 +28,11 @@ void AuraTestSuite::Initialize() {
|
| // Force unittests to run using en-US so if we test against string
|
| // output, it'll pass regardless of the system language.
|
| ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
|
| - ui::CompositorTestSupport::Initialize();
|
|
|
| ui::SetupTestCompositor();
|
| }
|
|
|
| void AuraTestSuite::Shutdown() {
|
| - ui::CompositorTestSupport::Terminate();
|
| ui::ResourceBundle::CleanupSharedInstance();
|
|
|
| base::TestSuite::Shutdown();
|
|
|