Register surface namespace in BlimpUiContextFactory

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 6230470986734820375f8e8c25c0eea054250121..7464631bf4834b37a210a959bbe4568cc165bcb7 100644
--- a/ui/compositor/test/in_process_context_factory.h
+++ b/ui/compositor/test/in_process_context_factory.h
@@ -28,10 +28,7 @@ class InProcessContextProvider;
 
 class InProcessContextFactory : public ContextFactory {
  public:
-  // surface_manager is owned by the creator of this and must outlive the
-  // context factory.
-  InProcessContextFactory(bool context_factory_for_test,
-                          cc::SurfaceManager* surface_manager);
+  InProcessContextFactory(bool context_factory_for_test);
   ~InProcessContextFactory() override;
 
   // If true (the default) an OutputSurface is created that does not display
@@ -55,6 +52,7 @@ class InProcessContextFactory : public ContextFactory {
   cc::SharedBitmapManager* GetSharedBitmapManager() override;
   gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override;
   cc::TaskGraphRunner* GetTaskGraphRunner() override;
+  cc::SurfaceManager* GetSurfaceManager() override;
   scoped_ptr<cc::SurfaceIdAllocator> CreateSurfaceIdAllocator() override;
   void ResizeDisplay(ui::Compositor* compositor,
                      const gfx::Size& size) override;
@@ -69,7 +67,7 @@ class InProcessContextFactory : public ContextFactory {
   uint32_t next_surface_id_namespace_;
   bool use_test_surface_;
   bool context_factory_for_test_;
-  cc::SurfaceManager* surface_manager_;
+  scoped_ptr<cc::SurfaceManager> surface_manager_;
 
   base::hash_map<Compositor*, cc::OnscreenDisplayClient*> per_compositor_data_;