Move test-only ContextFactory implementations out of production targets

ui/aura/test/aura_test_helper.cc

 // Copyright (c) 2012 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/aura_test_helper.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/default_activation_client.h"
 #include "ui/aura/client/default_capture_client.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/input_state_lookup.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/env_test_helper.h"
 #include "ui/aura/test/test_focus_client.h"
 #include "ui/aura/test/test_screen.h"
 #include "ui/aura/test/test_window_tree_client.h"
 #include "ui/base/ime/dummy_input_method.h"
 #include "ui/base/ime/input_method_initializer.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
+#include "ui/compositor/test/context_factories_for_test.h"
 #include "ui/gfx/screen.h"
 
 #if defined(USE_X11)
 #include "ui/aura/root_window_host_x11.h"
 #include "ui/base/x/x11_util.h"
 #endif
 
 #if defined(USE_OZONE)
 #include "ui/gfx/ozone/surface_factory_ozone.h"
 #endif
@@ skipping 24 matching lines @@
       << "AuraTestHelper::SetUp() never called.";
   CHECK(teardown_called_)
       << "AuraTestHelper::TearDown() never called.";
 }
 
 void AuraTestHelper::SetUp() {
   setup_called_ = true;
 
   // 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);
 
   Env::CreateInstance();
   // Unit tests generally don't want to query the system, rather use the state
   // from RootWindow.
   EnvTestHelper(Env::GetInstance()).SetInputStateLookup(
       scoped_ptr<InputStateLookup>());
 
   ui::InitializeInputMethodForTesting();
 
   test_screen_.reset(TestScreen::Create());
@@ skipping 28 matching lines @@
   test_screen_.reset();
   gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, NULL);
 
 #if defined(USE_X11)
   ui::ResetXCursorCache();
 #endif
 
   ui::ShutdownInputMethodForTesting();
 
   Env::DeleteInstance();
+
+  ui::TerminateContextFactoryForTests();
 }
 
 void AuraTestHelper::RunAllPendingInMessageLoop() {
   // TODO(jbates) crbug.com/134753 Find quitters of this RunLoop and have them
   //              use run_loop.QuitClosure().
   base::RunLoop run_loop(Env::GetInstance()->GetDispatcher());
   run_loop.RunUntilIdle();
 }
 
 }  // namespace test
 }  // namespace aura