Renamed v4l2_video_device.*->v4l2_device.* and generic_v4l2_video_device.*->generic_v4l2_device.* a…

content/common/gpu/media/v4l2_image_processor.h

 // Copyright 2014 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.
 
 #ifndef CONTENT_COMMON_GPU_MEDIA_V4L2_VIDEO_PROCESSOR_H_
 #define CONTENT_COMMON_GPU_MEDIA_V4L2_VIDEO_PROCESSOR_H_
 
 #include <queue>
 #include <vector>
 
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread.h"
 #include "content/common/content_export.h"
-#include "content/common/gpu/media/v4l2_video_device.h"
+#include "content/common/gpu/media/v4l2_device.h"
 #include "media/base/video_frame.h"
 
 namespace content {
 
 // Handles image processing accelerators that expose a V4L2 memory-to-memory
 // interface. The threading model of this class is the same as for other V4L2
 // hardware accelerators (see V4L2VideoDecodeAccelerator) for more details.
 class CONTENT_EXPORT V4L2ImageProcessor {
  public:
   explicit V4L2ImageProcessor(const scoped_refptr<V4L2Device>& device);
@@ skipping 145 matching lines @@
 
   // Weak factory for producing weak pointers on the device_thread_
   base::WeakPtrFactory<V4L2ImageProcessor> device_weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(V4L2ImageProcessor);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_MEDIA_V4L2_VIDEO_PROCESSOR_H_