Revert of Extract re-usable InitializeMediaFoundation()

content/common/gpu/media/dxva_video_decode_accelerator.cc

Index: content/common/gpu/media/dxva_video_decode_accelerator.cc
diff --git a/content/common/gpu/media/dxva_video_decode_accelerator.cc b/content/common/gpu/media/dxva_video_decode_accelerator.cc
index 568b128e1d1bdea5e0d98bed04fda5db6b54b733..628bccd0f45ed8d26dc149e1728fa8ebcdf8cc26 100644
--- a/content/common/gpu/media/dxva_video_decode_accelerator.cc
+++ b/content/common/gpu/media/dxva_video_decode_accelerator.cc
@@ -29,7 +29,6 @@
 #include "base/path_service.h"
 #include "base/trace_event/trace_event.h"
 #include "base/win/windows_version.h"
-#include "media/base/win/mf_initializer.h"
 #include "media/video/video_decode_accelerator.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_context.h"
@@ -599,7 +598,9 @@
   RETURN_AND_NOTIFY_ON_FAILURE((state == kUninitialized),
       "Initialize: invalid state: " << state, ILLEGAL_STATE, false);
 
-  media::InitializeMediaFoundation();
+  HRESULT hr = MFStartup(MF_VERSION, MFSTARTUP_FULL);
+  RETURN_AND_NOTIFY_ON_HR_FAILURE(hr, "MFStartup failed.", PLATFORM_FAILURE,
+      false);
 
   RETURN_AND_NOTIFY_ON_FAILURE(InitDecoder(profile),
       "Failed to initialize decoder", PLATFORM_FAILURE, false);
@@ -1446,6 +1447,7 @@
     query_.Release();
   }
 
+  MFShutdown();
   SetState(kUninitialized);
 }