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

cc/test/test_gpu_memory_buffer_manager.h

Index: cc/test/test_gpu_memory_buffer_manager.h
diff --git a/cc/test/test_gpu_memory_buffer_manager.h b/cc/test/test_gpu_memory_buffer_manager.h
index 267e6fecba370327d7c977c7d0891b598a90caad..fd1c66a81acbd2bcc1a715598e5c5f71f53159b1 100644
--- a/cc/test/test_gpu_memory_buffer_manager.h
+++ b/cc/test/test_gpu_memory_buffer_manager.h
@@ -5,16 +5,16 @@
 #ifndef CC_TEST_TEST_GPU_MEMORY_BUFFER_MANAGER_H_
 #define CC_TEST_TEST_GPU_MEMORY_BUFFER_MANAGER_H_
 
-#include "cc/resources/gpu_memory_buffer_manager.h"
+#include "gpu/command_buffer/client/gpu_memory_buffer_manager.h"
 
 namespace cc {
 
-class TestGpuMemoryBufferManager : public GpuMemoryBufferManager {
+class TestGpuMemoryBufferManager : public gpu::GpuMemoryBufferManager {
  public:
   TestGpuMemoryBufferManager();
   ~TestGpuMemoryBufferManager() override;
 
-  // Overridden from GpuMemoryBufferManager:
+  // Overridden from gpu::GpuMemoryBufferManager:
   scoped_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBuffer(
       const gfx::Size& size,
       gfx::GpuMemoryBuffer::Format format,