Revert of Introduce components/display_compositor

content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Unit test for VideoCaptureBufferPool.
 
 #include "content/browser/renderer_host/media/video_capture_buffer_pool.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <string.h>
 
 #include <memory>
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
 #include "build/build_config.h"
 #include "cc/test/test_context_provider.h"
 #include "cc/test/test_web_graphics_context_3d.h"
-#include "components/display_compositor/buffer_queue.h"
+#include "content/browser/compositor/buffer_queue.h"
 #include "content/browser/gpu/browser_gpu_memory_buffer_manager.h"
 #include "content/browser/renderer_host/media/video_capture_controller.h"
 #include "media/base/video_frame.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace content {
 
 struct PixelFormatAndStorage {
   media::VideoPixelFormat pixel_format;
@@ skipping 70 matching lines @@
     StubBrowserGpuMemoryBufferManager() : BrowserGpuMemoryBufferManager(1, 1) {}
 
     std::unique_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBuffer(
         const gfx::Size& size,
         gfx::BufferFormat format,
         gfx::BufferUsage usage,
         int32_t surface_id) override {
       return base::WrapUnique(new MockGpuMemoryBuffer(size));
     }
   };
-  class MockBufferQueue : public display_compositor::BufferQueue {
+  class MockBufferQueue : public BufferQueue {
    public:
     MockBufferQueue(scoped_refptr<cc::ContextProvider> context_provider,
                     BrowserGpuMemoryBufferManager* gpu_memory_buffer_manager,
                     unsigned int target,
                     unsigned int internalformat)
         : BufferQueue(context_provider,
                       target,
                       internalformat,
                       nullptr,
                       gpu_memory_buffer_manager,
@@ skipping 391 matching lines @@
   ASSERT_NE(nullptr, held_buffers.back().get());
   resurrected = ResurrectLastBuffer(gfx::Size(10, 10), GetParam());
   ASSERT_EQ(nullptr, resurrected.get());
 }
 
 INSTANTIATE_TEST_CASE_P(,
                         VideoCaptureBufferPoolTest,
                         testing::ValuesIn(kCapturePixelFormatAndStorages));
 
 } // namespace content