Composite to cc::Display from ui::InProcessContextFactory.

ui/compositor/test/in_process_context_factory.h

Index: ui/compositor/test/in_process_context_factory.h
diff --git a/ui/compositor/test/in_process_context_factory.h b/ui/compositor/test/in_process_context_factory.h
index 55642ca41049509ffabc57a317a9e5d1ae32dc29..ba7324138a74f3d7b02e491e3b120b0ae7f916ad 100644
--- a/ui/compositor/test/in_process_context_factory.h
+++ b/ui/compositor/test/in_process_context_factory.h
@@ -13,11 +13,17 @@ namespace base {
 class Thread;
 }
 
+namespace cc {
+class OnscreenDisplayClient;
+class SurfaceManager;
+}
+
 namespace ui {
 
 class InProcessContextFactory : public ContextFactory {
  public:
-  explicit InProcessContextFactory(bool context_factory_for_test);
+  InProcessContextFactory(bool context_factory_for_test,
+                          cc::SurfaceManager* surface_manager);

[sky, 2015/02/03 00:44:58]

nit: document ownership.

[jbauman, 2015/02/03 01:47:21]

Done.

   ~InProcessContextFactory() override;
 
   // If true (the default) an OutputSurface is created that does not display
@@ -51,8 +57,10 @@ class InProcessContextFactory : public ContextFactory {
   cc::TestGpuMemoryBufferManager gpu_memory_buffer_manager_;
   uint32_t next_surface_id_namespace_;
   bool use_test_surface_;
+  bool context_factory_for_test_;
+  cc::SurfaceManager* surface_manager_;
 
-  const bool context_factory_for_test_;
+  base::hash_map<Compositor*, cc::OnscreenDisplayClient*> per_compositor_data_;
 
   DISALLOW_COPY_AND_ASSIGN(InProcessContextFactory);
 };