Fix up compositor mocking.

ui/aura/test/test_suite.cc

Index: ui/aura/test/test_suite.cc
diff --git a/ui/aura/test/test_suite.cc b/ui/aura/test/test_suite.cc
index 4c4faa697ee9a5cee2c5d046fee68b564e87c763..b75f337f5c56932ad3d3ebfc50711b9b8fa43557 100644
--- a/ui/aura/test/test_suite.cc
+++ b/ui/aura/test/test_suite.cc
@@ -10,6 +10,7 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/gfx/compositor/compositor_test_support.h"
+#include "ui/gfx/compositor/test_compositor.h"
 #include "ui/gfx/gfx_paths.h"
 #include "ui/gfx/gl/gl_implementation.h"
 
@@ -29,7 +30,7 @@ void AuraTestSuite::Initialize() {
   // output, it'll pass regardless of the system language.
   ui::ResourceBundle::InitSharedInstance("en-US");
   ui::CompositorTestSupport::Initialize();
-  ui::CompositorTestSupport::SetupMockCompositor();
+  ui::TestCompositor::SetupTestCompositor();

[sky, 2011/10/26 15:36:15]

It is possible to only have one initialize/setup call? Maybe it could take
whether you want the test compositor or the real compositor.

[jonathan.backer, 2011/10/26 15:58:33]

ui::CompositorTestSupport::Initialize() pulls in a dependency that we don't
always want when using ui::TestCompositor::SetupTestCompositor()

which is why they are in two different targets with two different calls. I
imagine that in the longer term (once the WK compositor is extracted from WK),
ui::CompositorTestSupport::Initialize() will disappear entirely.

 }
 
 void AuraTestSuite::Shutdown() {