x11: Use scoped_ptr<> for X11 objects where it makes sense.

ui/gfx/x/x11_types.cc

 // Copyright (c) 2013 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.
 
 #include "ui/gfx/x/x11_types.h"
 
 #include <X11/Xlib.h>
 
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 27 matching lines @@
                visual, depth,
                pixmap, pixmap_gc,
                data, width, height,
                0, 0, // src_x, src_y
                0, 0, // dst_x, dst_y
                width, height);
 }
 
 int BitsPerPixelForPixmapDepth(XDisplay* dpy, int depth) {
   int count;
-  XPixmapFormatValues* formats = XListPixmapFormats(dpy, &count);
+  XScopedPtr<XPixmapFormatValues[]> formats(XListPixmapFormats(dpy, &count));
   if (!formats)
     return -1;
 
-  int bits_per_pixel = -1;
   for (int i = 0; i < count; ++i) {
-    if (formats[i].depth == depth) {
-      bits_per_pixel = formats[i].bits_per_pixel;
-      break;
-    }
+    if (formats[i].depth == depth)
+      return formats[i].bits_per_pixel;
   }
 
-  XFree(formats);
-  return bits_per_pixel;
+  return -1;
 }
 
 void PutARGBImage(XDisplay* display,
                   void* visual, int depth,
                   XID pixmap, void* pixmap_gc,
                   const uint8* data,
                   int data_width, int data_height,
                   int src_x, int src_y,
                   int dst_x, int dst_y,
                   int copy_width, int copy_height) {
@@ skipping 89 matching lines @@
     free(orig_bitmap16);
   } else {
     LOG(FATAL) << "Sorry, we don't support your visual depth without "
                   "Xrender support (depth:" << depth
                << " bpp:" << pixmap_bpp << ")";
   }
 }
 
 }  // namespace gfx