Register surface namespace in BlimpUiContextFactory

blimp/engine/app/ui/blimp_ui_context_factory.cc

Index: blimp/engine/app/ui/blimp_ui_context_factory.cc
diff --git a/blimp/engine/app/ui/blimp_ui_context_factory.cc b/blimp/engine/app/ui/blimp_ui_context_factory.cc
index d41150a294d2abfa85a610a1a97effe1f4cbb362..f799912298c5cc347e6e5993d6b6e20a5e1fb52e 100644
--- a/blimp/engine/app/ui/blimp_ui_context_factory.cc
+++ b/blimp/engine/app/ui/blimp_ui_context_factory.cc
@@ -7,6 +7,7 @@
 #include "cc/output/output_surface.h"
 #include "cc/resources/shared_bitmap_manager.h"
 #include "cc/surfaces/surface_id_allocator.h"
+#include "content/public/browser/surface_utils.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "ui/compositor/reflector.h"
 
@@ -70,8 +71,11 @@ cc::TaskGraphRunner* BlimpUiContextFactory::GetTaskGraphRunner() {
 
 scoped_ptr<cc::SurfaceIdAllocator>
 BlimpUiContextFactory::CreateSurfaceIdAllocator() {
-  return make_scoped_ptr(
-      new cc::SurfaceIdAllocator(next_surface_id_namespace_++));
+  scoped_ptr<cc::SurfaceIdAllocator> allocator =
+      make_scoped_ptr(new cc::SurfaceIdAllocator(next_surface_id_namespace_++));
+  if (content::GetSurfaceManager())
+    allocator->RegisterSurfaceIdNamespace(content::GetSurfaceManager());
+  return allocator;
 }
 
 void BlimpUiContextFactory::ResizeDisplay(ui::Compositor* compositor,