Move D3D11 accelerator to windows/

Bug: 
Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Change-Id: I5979881b8b9c05ca99f88531fc6e565feeee0c13
Reviewed-on: https://chromium-review.googlesource.com/804687
Commit-Queue: Frank Liberato <liberato@chromium.org>
Reviewed-by: Dan Sanders <sandersd@chromium.org>
Cr-Commit-Position: refs/heads/master@{#521916}

media/gpu/BUILD.gn

@@ -360,8 +360,6 @@ component("gpu") {
 
   if (is_win) {
     sources += [
-      "d3d11_h264_accelerator.cc",
-      "d3d11_h264_accelerator.h",
       "d3d11_video_decode_accelerator_win.cc",
       "d3d11_video_decode_accelerator_win.h",
       "dxva_picture_buffer_win.cc",
@@ -370,6 +368,8 @@ component("gpu") {
       "dxva_video_decode_accelerator_win.h",
       "media_foundation_video_encode_accelerator_win.cc",
       "media_foundation_video_encode_accelerator_win.h",
+      "windows/d3d11_h264_accelerator.cc",
+      "windows/d3d11_h264_accelerator.h",
     ]
     configs += [
       # TODO(crbug.com/167187): Fix size_t to int truncations.

media/gpu/d3d11_video_decode_accelerator_win.cc

@@ -13,9 +13,9 @@
 #include "base/memory/shared_memory.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/trace_event/trace_event.h"
-#include "media/gpu/d3d11_h264_accelerator.h"
 #include "media/gpu/h264_decoder.h"
 #include "media/gpu/h264_dpb.h"
+#include "media/gpu/windows/d3d11_h264_accelerator.h"
 #include "ui/gfx/color_space.h"
 #include "ui/gl/gl_angle_util_win.h"
 #include "ui/gl/gl_bindings.h"

media/gpu/d3d11_video_decode_accelerator_win.h

@@ -12,9 +12,9 @@
 #include <memory>
 
 #include "media/gpu/accelerated_video_decoder.h"
-#include "media/gpu/d3d11_h264_accelerator.h"
 #include "media/gpu/gpu_video_decode_accelerator_helpers.h"
 #include "media/gpu/media_gpu_export.h"
+#include "media/gpu/windows/d3d11_h264_accelerator.h"
 #include "media/video/video_decode_accelerator.h"
 
 namespace media {

media/gpu/d3d11_h264_accelerator.cc → media/gpu/windows/d3d11_h264_accelerator.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/gpu/d3d11_h264_accelerator.h"
+#include "media/gpu/windows/d3d11_h264_accelerator.h"
 
 #include <windows.h>
 

media/gpu/d3d11_h264_accelerator.h → media/gpu/windows/d3d11_h264_accelerator.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_GPU_D3D11_H264_ACCELERATOR_H_
-#define MEDIA_GPU_D3D11_H264_ACCELERATOR_H_
+#ifndef MEDIA_GPU_WINDOWS_D3D11_H264_ACCELERATOR_H_
+#define MEDIA_GPU_WINDOWS_D3D11_H264_ACCELERATOR_H_
 
 #include <d3d11.h>
 #include <d3d9.h>
@@ -143,4 +143,4 @@ class D3D11H264Accelerator : public H264Decoder::H264Accelerator {
 
 }  // namespace media
 
-#endif  // MEDIA_GPU_D3D11_H264_ACCELERATOR_H_
+#endif  // MEDIA_GPU_D3D11_WINDOWS_H264_ACCELERATOR_H_

media/gpu/windows/d3d11_video_decoder_impl.h

@@ -17,9 +17,9 @@
 #include "base/memory/weak_ptr.h"
 #include "gpu/ipc/service/command_buffer_stub.h"
 #include "media/base/video_decoder.h"
-#include "media/gpu/d3d11_h264_accelerator.h"
 #include "media/gpu/gles2_decoder_helper.h"
 #include "media/gpu/media_gpu_export.h"
+#include "media/gpu/windows/d3d11_h264_accelerator.h"
 #include "media/gpu/windows/output_with_release_mailbox_cb.h"
 
 namespace media {