Fix CompositorCC initialization/shutdown

BUG=None
TEST=compositor_unittests


Review URL: http://codereview.chromium.org/8772072

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

ui/gfx/compositor/compositor_cc.cc

@@ -166,9 +166,10 @@ void CompositorCC::Terminate() {
 #ifdef WEBCOMPOSITOR_HAS_INITIALIZE
   WebKit::WebCompositor::shutdown();
 #endif
-  DCHECK(g_compositor_thread);
-  delete g_compositor_thread;
-  g_compositor_thread = NULL;
+  if (g_compositor_thread) {
+    delete g_compositor_thread;
+    g_compositor_thread = NULL;
+  }
 }
 
 // static

ui/gfx/compositor/test/test_suite.cc

@@ -32,9 +32,15 @@ void CompositorTestSuite::Initialize() {
 
   message_loop_.reset(new MessageLoop(MessageLoop::TYPE_UI));
   ui::CompositorTestSupport::Initialize();
+#if defined(USE_WEBKIT_COMPOSITOR)
+  ui::CompositorCC::Initialize(false);
+#endif
 }
 
 void CompositorTestSuite::Shutdown() {
+#if defined(USE_WEBKIT_COMPOSITOR)
+  ui::CompositorCC::Terminate();
+#endif
   ui::CompositorTestSupport::Terminate();
   message_loop_.reset();