Temporarily adds another constructor to Compositor

ui/compositor/test/context_factories_for_test.h

Index: ui/compositor/test/context_factories_for_test.h
diff --git a/ui/compositor/test/context_factories_for_test.h b/ui/compositor/test/context_factories_for_test.h
index ae4e51e7bc2d03fd77f4d2aa5070653627f0a85e..e54d20639d24d6fc0a753569b5a42a432fafcbeb 100644
--- a/ui/compositor/test/context_factories_for_test.h
+++ b/ui/compositor/test/context_factories_for_test.h
@@ -4,13 +4,17 @@
 
 namespace ui {
 
+class ContextFactory;
+
 // Set up the compositor ContextFactory for a test environment. Unit tests
 // that do not have a full content environment need to call this before
 // initializing the Compositor.
 // Some tests expect pixel output, and they should pass true for
 // |enable_pixel_output|. Most unit tests should pass false. Once this has been
 // called, the caller must call TerminateContextFactoryForTests() to clean up.
-void InitializeContextFactoryForTests(bool enable_pixel_output);
+// TODO(sky): this should return a scoped_ptr and then nuke
+// TerminateContextFactoryForTests().
+ui::ContextFactory* InitializeContextFactoryForTests(bool enable_pixel_output);
 void TerminateContextFactoryForTests();
 
 }  // namespace ui