Move test-only ContextFactory implementations out of production targets

content/browser/aura/software_output_device_ozone_unittest.cc

Index: content/browser/aura/software_output_device_ozone_unittest.cc
diff --git a/content/browser/aura/software_output_device_ozone_unittest.cc b/content/browser/aura/software_output_device_ozone_unittest.cc
index 552116e73b4e48c0c9ddd38656636ed0635a465b..30c696ccabcbab275ea15b40d045322f35046eb1 100644
--- a/content/browser/aura/software_output_device_ozone_unittest.cc
+++ b/content/browser/aura/software_output_device_ozone_unittest.cc
@@ -9,6 +9,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmapDevice.h"
 #include "ui/compositor/compositor.h"
+#include "ui/compositor/test/context_factories_for_test.h"
 #include "ui/gfx/ozone/surface_factory_ozone.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/skia_util.h"
@@ -83,7 +84,7 @@ SoftwareOutputDeviceOzoneTest::~SoftwareOutputDeviceOzoneTest() {
 }
 
 void SoftwareOutputDeviceOzoneTest::SetUp() {
-  ui::Compositor::InitializeContextFactoryForTests(false);
+  ui::InitializeContextFactoryForTests(false);
   ui::Compositor::Initialize();
 
   surface_factory_.reset(new MockSurfaceFactoryOzone());
@@ -103,6 +104,7 @@ void SoftwareOutputDeviceOzoneTest::TearDown() {
   output_device_.reset();
   compositor_.reset();
   surface_factory_.reset();
+  ui::TerminateContextFactoryForTests();
   ui::Compositor::Terminate();
 }