Fix up compositor mocking.

ui/aura/test/test_suite.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/aura/test/test_suite.h"
 
 #include "base/file_path.h"
 #include "base/path_service.h"
 #include "build/build_config.h"
 #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"
 
 namespace aura {
 namespace test {
 
 AuraTestSuite::AuraTestSuite(int argc, char** argv)
     : TestSuite(argc, argv) {}
 
 void AuraTestSuite::Initialize() {
   base::TestSuite::Initialize();
 
   gfx::RegisterPathProvider();
   ui::RegisterPathProvider();
 
   // Force unittests to run using en-US so if we test against string
   // 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() {
   ui::CompositorTestSupport::Terminate();
   ui::ResourceBundle::CleanupSharedInstance();
 
   base::TestSuite::Shutdown();
 }
 
 }  // namespace test
 }  // namespace aura