Update from chromium https://crrev.com/301725/

cc/surfaces/display.h

Index: cc/surfaces/display.h
diff --git a/cc/surfaces/display.h b/cc/surfaces/display.h
index 94202c5628369e65ebaecaa524504bc0b270fa05..2346a40d3178dae6b0220af27dd0bcab5d5689d5 100644
--- a/cc/surfaces/display.h
+++ b/cc/surfaces/display.h
@@ -42,7 +42,7 @@ class CC_SURFACES_EXPORT Display : public OutputSurfaceClient,
   Display(DisplayClient* client,
           SurfaceManager* manager,
           SharedBitmapManager* bitmap_manager,
-          GpuMemoryBufferManager* gpu_memory_buffer_manager);
+          gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager);
   ~Display() override;
 
   bool Initialize(scoped_ptr<OutputSurface> output_surface);
@@ -85,7 +85,7 @@ class CC_SURFACES_EXPORT Display : public OutputSurfaceClient,
   DisplayClient* client_;
   SurfaceManager* manager_;
   SharedBitmapManager* bitmap_manager_;
-  GpuMemoryBufferManager* gpu_memory_buffer_manager_;
+  gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager_;
   SurfaceId current_surface_id_;
   gfx::Size current_surface_size_;
   LayerTreeSettings settings_;