| Index: ui/aura/demo/demo_main.cc
|
| diff --git a/ui/aura/demo/demo_main.cc b/ui/aura/demo/demo_main.cc
|
| index 41717d268de4f10d60981ee00bed8338486f1948..f6d5f27ff15a8bfb65a4779ad9e3494c2839fa89 100644
|
| --- a/ui/aura/demo/demo_main.cc
|
| +++ b/ui/aura/demo/demo_main.cc
|
| @@ -19,7 +19,6 @@
|
| #include "ui/base/hit_test.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
| #include "ui/base/ui_base_paths.h"
|
| -#include "ui/compositor/test/compositor_test_support.h"
|
| #include "ui/gfx/canvas.h"
|
| #include "ui/gfx/rect.h"
|
|
|
| @@ -110,7 +109,6 @@ class DemoStackingClient : public aura::client::StackingClient {
|
| int DemoMain() {
|
| // Create the message-loop here before creating the root window.
|
| base::MessageLoop message_loop(base::MessageLoop::TYPE_UI);
|
| - ui::CompositorTestSupport::Initialize();
|
| aura::Env::GetInstance();
|
| scoped_ptr<aura::TestScreen> test_screen(aura::TestScreen::Create());
|
| gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen.get());
|
| @@ -147,8 +145,6 @@ int DemoMain() {
|
| root_window->ShowRootWindow();
|
| base::MessageLoopForUI::current()->Run();
|
|
|
| - ui::CompositorTestSupport::Terminate();
|
| -
|
| return 0;
|
| }
|
|
|
|
|