Convert scoped_ptr_malloc -> scoped_ptr, part 1.

content/common/gpu/media/vaapi_video_decode_accelerator.cc

Index: content/common/gpu/media/vaapi_video_decode_accelerator.cc
diff --git a/content/common/gpu/media/vaapi_video_decode_accelerator.cc b/content/common/gpu/media/vaapi_video_decode_accelerator.cc
index da38fd26566123c62b7e6363ce74dba6611f5c1c..73471d64eaf2256738fa353ea67fc7d87a54d4d6 100644
--- a/content/common/gpu/media/vaapi_video_decode_accelerator.cc
+++ b/content/common/gpu/media/vaapi_video_decode_accelerator.cc
@@ -263,7 +263,7 @@ VaapiVideoDecodeAccelerator::~VaapiVideoDecodeAccelerator() {
   DCHECK_EQ(message_loop_, base::MessageLoop::current());
 }
 
-class ScopedPtrXFree {
+class XFreeDeleter {
  public:
   void operator()(void* x) const {
     ::XFree(x);
@@ -280,7 +280,7 @@ bool VaapiVideoDecodeAccelerator::InitializeFBConfig() {
   };
 
   int num_fbconfigs;
-  scoped_ptr_malloc<GLXFBConfig, ScopedPtrXFree> glx_fb_configs(
+  scoped_ptr<GLXFBConfig, XFreeDeleter> glx_fb_configs(
       glXChooseFBConfig(x_display_, DefaultScreen(x_display_), fbconfig_attr,
                         &num_fbconfigs));
   if (!glx_fb_configs)