Revert 216780 "Clean up compositor initialization/destruction."

trunk/src/ash/test/test_shell_delegate.cc

Index: trunk/src/ash/test/test_shell_delegate.cc
===================================================================
--- trunk/src/ash/test/test_shell_delegate.cc	(revision 216906)
+++ trunk/src/ash/test/test_shell_delegate.cc	(working copy)
@@ -17,7 +17,6 @@
 #include "base/logging.h"
 #include "content/public/test/test_browser_context.h"
 #include "ui/aura/window.h"
-#include "ui/compositor/compositor.h"
 
 namespace ash {
 namespace test {
@@ -204,10 +203,6 @@
 }
 
 RootWindowHostFactory* TestShellDelegate::CreateRootWindowHostFactory() {
-  // The ContextFactory must exist before any Compositors are created.
-  bool allow_test_contexts = true;
-  ui::Compositor::InitializeContextFactoryForTests(allow_test_contexts);
-
   return RootWindowHostFactory::Create();
 }