Remove support for Intel VP9 and VP8 MFT.

media/gpu/dxva_video_decode_accelerator_win.cc

Index: media/gpu/dxva_video_decode_accelerator_win.cc
diff --git a/media/gpu/dxva_video_decode_accelerator_win.cc b/media/gpu/dxva_video_decode_accelerator_win.cc
index ce43d8713c650bd2109c259d0bd5a6335e3f84db..0c2963f4ec2507719a0c94acf2f07d28b89f93de 100644
--- a/media/gpu/dxva_video_decode_accelerator_win.cc
+++ b/media/gpu/dxva_video_decode_accelerator_win.cc
@@ -51,41 +51,8 @@
 
 namespace {
 
-// Path is appended on to the PROGRAM_FILES base path.
-const wchar_t kVPXDecoderDLLPath[] = L"Intel\\Media SDK\\";
-
-const wchar_t kVP8DecoderDLLName[] =
-#if defined(ARCH_CPU_X86)
-    L"mfx_mft_vp8vd_32.dll";
-#elif defined(ARCH_CPU_X86_64)
-    L"mfx_mft_vp8vd_64.dll";
-#else
-#error Unsupported Windows CPU Architecture
-#endif
-
-const wchar_t kVP9DecoderDLLName[] =
-#if defined(ARCH_CPU_X86)
-    L"mfx_mft_vp9vd_32.dll";
-#elif defined(ARCH_CPU_X86_64)
-    L"mfx_mft_vp9vd_64.dll";
-#else
-#error Unsupported Windows CPU Architecture
-#endif
-
 const wchar_t kMSVP9DecoderDLLName[] = L"MSVP9DEC.dll";
 
-const CLSID CLSID_WebmMfVp8Dec = {
-    0x451e3cb7,
-    0x2622,
-    0x4ba5,
-    {0x8e, 0x1d, 0x44, 0xb3, 0xc4, 0x1d, 0x09, 0x24}};
-
-const CLSID CLSID_WebmMfVp9Dec = {
-    0x07ab4bd2,
-    0x1979,
-    0x4fcd,
-    {0xa6, 0x97, 0xdf, 0x9a, 0xd1, 0x5b, 0x34, 0xfe}};
-
 const CLSID MEDIASUBTYPE_VP80 = {
     0x30385056,
     0x0000,
@@ -1436,30 +1403,6 @@ bool DXVAVideoDecodeAccelerator::InitDecoder(VideoCodecProfile profile) {
       if (decoder_dll)
         using_ms_vp9_mft_ = true;
     }
-    if (!decoder_dll) {
-      int program_files_key = base::DIR_PROGRAM_FILES;
-      if (base::win::OSInfo::GetInstance()->wow64_status() ==
-          base::win::OSInfo::WOW64_ENABLED) {
-        program_files_key = base::DIR_PROGRAM_FILES6432;
-      }
-
-      base::FilePath dll_path;
-      RETURN_ON_FAILURE(PathService::Get(program_files_key, &dll_path),
-                        "failed to get path for Program Files", false);
-
-      dll_path = dll_path.Append(kVPXDecoderDLLPath);
-      if (profile == VP8PROFILE_ANY) {
-        codec_ = kCodecVP8;
-        dll_path = dll_path.Append(kVP8DecoderDLLName);
-        clsid = CLSID_WebmMfVp8Dec;
-      } else {
-        codec_ = kCodecVP9;
-        dll_path = dll_path.Append(kVP9DecoderDLLName);
-        clsid = CLSID_WebmMfVp9Dec;
-      }
-      decoder_dll = ::LoadLibraryEx(dll_path.value().data(), NULL,
-                                    LOAD_WITH_ALTERED_SEARCH_PATH);
-    }
     RETURN_ON_FAILURE(decoder_dll, "vpx decoder dll is not loaded", false);
   } else {
     RETURN_ON_FAILURE(false, "Unsupported codec.", false);