Revert 202787 "Remove unnecessary ui::CompositorTestSupport"

Suspected to break Linux ChromeOS build
http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Full/builds/19953/steps/compile/logs/stdio

obj/ui/snapshot/test/snapshot_unittests.run_all_unittests.o:run_all_unittests.cc:function
main:error: undefined reference to
'ui::test::CompositorTestSuite::CompositorTestSuite(int, char**)'
obj/ui/snapshot/test/snapshot_unittests.run_all_unittests.o:run_all_unittests.cc:function
main:error: undefined reference to
'ui::test::CompositorTestSuite::~CompositorTestSuite()'


> Remove unnecessary ui::CompositorTestSupport
> 
> The ui::CompositorTestSupport class existed to initialize WebKit since
> ui::Compositor depends on cc which used to depend on WebKit being initialized
> to function properly.  cc no longer has this requirement, so this class is
> unnecessary.
> 
> R=piman, sky
> 
> Review URL: https://chromiumcodereview.appspot.com/14744016

TBR=jamesr@chromium.org

Review URL: https://codereview.chromium.org/15838015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202790 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 11 insertions, 0 deletions

diff --git a/ui/aura/bench/bench_main.cc b/ui/aura/bench/bench_main.cc
index 4f0afe1..e397929 100644
--- a/ui/aura/bench/bench_main.cc
+++ b/ui/aura/bench/bench_main.cc
@@ -25,6 +25,7 @@
 #include "ui/compositor/compositor_observer.h"
 #include "ui/compositor/debug_utils.h"
 #include "ui/compositor/layer.h"
+#include "ui/compositor/test/compositor_test_support.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/skia_util.h"
@@ -301,6 +302,7 @@ int main(int argc, char** argv) {
   ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
 
   base::MessageLoop message_loop(base::MessageLoop::TYPE_UI);
+  ui::CompositorTestSupport::Initialize();
   aura::Env::GetInstance();
   scoped_ptr<aura::TestScreen> test_screen(
       aura::TestScreen::CreateFullscreen());
@@ -359,5 +361,7 @@ int main(int argc, char** argv) {
   focus_client.reset();
   root_window.reset();
 
+  ui::CompositorTestSupport::Terminate();
+
   return 0;
 }
diff --git a/ui/aura/demo/demo_main.cc b/ui/aura/demo/demo_main.cc
index f6d5f27..41717d2 100644
--- a/ui/aura/demo/demo_main.cc
+++ b/ui/aura/demo/demo_main.cc
@@ -19,6 +19,7 @@
 #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"
 
@@ -109,6 +110,7 @@ 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());
@@ -145,6 +147,8 @@ int DemoMain() {
   root_window->ShowRootWindow();
   base::MessageLoopForUI::current()->Run();
 
+  ui::CompositorTestSupport::Terminate();
+
   return 0;
 }
 
diff --git a/ui/aura/test/test_suite.cc b/ui/aura/test/test_suite.cc
index 5b76a17..e487c9b 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/compositor/compositor_setup.h"
+#include "ui/compositor/test/compositor_test_support.h"
 #include "ui/gfx/gfx_paths.h"
 #include "ui/gl/gl_implementation.h"
 
@@ -28,11 +29,13 @@ 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();