| Index: ash/test/test_suite.cc
|
| diff --git a/ash/test/test_suite.cc b/ash/test/test_suite.cc
|
| index 66d9769b48b3f44c8a31f3502064be999560fa7c..02c5f2980be730f7ac264c9800576d6f6f64efc7 100644
|
| --- a/ash/test/test_suite.cc
|
| +++ b/ash/test/test_suite.cc
|
| @@ -13,7 +13,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"
|
|
|
| #if defined(OS_MACOSX)
|
| @@ -56,12 +55,10 @@ void AuraShellTestSuite::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 AuraShellTestSuite::Shutdown() {
|
| - ui::CompositorTestSupport::Terminate();
|
| ui::ResourceBundle::CleanupSharedInstance();
|
| #if defined(OS_WIN)
|
| com_initializer_.reset();
|
|
|