Move test-only ContextFactory implementations out of production targets

ash/test/test_shell_delegate.cc

Index: ash/test/test_shell_delegate.cc
diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc
index d7c11bddf071a700e488acdf8e8e29898f24a206..f40efa3e159df7cdf8f72b8b90ca0a35fe5daf6c 100644
--- a/ash/test/test_shell_delegate.cc
+++ b/ash/test/test_shell_delegate.cc
@@ -22,7 +22,7 @@
 #include "base/logging.h"
 #include "content/public/test/test_browser_context.h"
 #include "ui/aura/window.h"
-#include "ui/compositor/compositor.h"
+#include "ui/compositor/test/context_factories_for_test.h"
 
 namespace ash {
 namespace test {
@@ -34,6 +34,7 @@ TestShellDelegate::TestShellDelegate()
 }
 
 TestShellDelegate::~TestShellDelegate() {
+  ui::TerminateContextFactoryForTests();
 }
 
 bool TestShellDelegate::IsFirstRunAfterBoot() const {
@@ -149,7 +150,7 @@ ui::MenuModel* TestShellDelegate::CreateContextMenu(aura::RootWindow* root) {
 RootWindowHostFactory* TestShellDelegate::CreateRootWindowHostFactory() {
   // The ContextFactory must exist before any Compositors are created.
   bool allow_test_contexts = true;
-  ui::Compositor::InitializeContextFactoryForTests(allow_test_contexts);
+  ui::InitializeContextFactoryForTests(allow_test_contexts);
 
   return RootWindowHostFactory::Create();
 }