x11: Use gfx::XScopedPtr<> in more places.

ui/views/widget/desktop_aura/desktop_screen_x11.cc

 // Copyright (c) 2012 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/views/widget/desktop_aura/desktop_screen_x11.h"
 
 #include <X11/extensions/Xrandr.h>
 #include <X11/Xlib.h>
 
 // It clashes with out RootWindow.
@@ skipping 241 matching lines @@
     const std::vector<gfx::Display>& test_displays)
     : xdisplay_(gfx::GetXDisplay()),
       x_root_window_(DefaultRootWindow(xdisplay_)),
       has_xrandr_(false),
       xrandr_event_base_(0),
       displays_(test_displays) {
 }
 
 std::vector<gfx::Display> DesktopScreenX11::BuildDisplaysFromXRandRInfo() {
   std::vector<gfx::Display> displays;
-  XRRScreenResources* resources =
-      XRRGetScreenResourcesCurrent(xdisplay_, x_root_window_);
+  gfx::XScopedPtr<
+      XRRScreenResources,
+      gfx::XObjectDeleter<XRRScreenResources, void, XRRFreeScreenResources>>
+      resources(XRRGetScreenResourcesCurrent(xdisplay_, x_root_window_));
   if (!resources) {
     LOG(ERROR) << "XRandR returned no displays. Falling back to Root Window.";
     return GetFallbackDisplayList();
   }
 
   bool has_work_area = false;
   gfx::Rect work_area;
   std::vector<int> value;
   if (ui::GetIntArrayProperty(x_root_window_, "_NET_WORKAREA", &value) &&
       value.size() >= 4) {
     work_area = gfx::Rect(value[0], value[1], value[2], value[3]);
     has_work_area = true;
   }
 
   float device_scale_factor = 1.0f;
   for (int i = 0; i < resources->noutput; ++i) {
     RROutput output_id = resources->outputs[i];
-    XRROutputInfo* output_info =
-        XRRGetOutputInfo(xdisplay_, resources, output_id);
+    gfx::XScopedPtr<XRROutputInfo,
+                    gfx::XObjectDeleter<XRROutputInfo, void, XRRFreeOutputInfo>>
+        output_info(XRRGetOutputInfo(xdisplay_, resources.get(), output_id));
 
     bool is_connected = (output_info->connection == RR_Connected);
-    if (!is_connected) {
-      XRRFreeOutputInfo(output_info);
+    if (!is_connected)
       continue;
-    }
 
     if (output_info->crtc) {
-      XRRCrtcInfo *crtc = XRRGetCrtcInfo(xdisplay_,
-                                         resources,
-                                         output_info->crtc);
+      gfx::XScopedPtr<XRRCrtcInfo,
+                      gfx::XObjectDeleter<XRRCrtcInfo, void, XRRFreeCrtcInfo>>
+          crtc(XRRGetCrtcInfo(xdisplay_, resources.get(), output_info->crtc));
 
       int64 display_id = -1;
       if (!ui::GetDisplayId(output_id, static_cast<uint8>(i), &display_id)) {
         // It isn't ideal, but if we can't parse the EDID data, fallback on the
         // display number.
         display_id = i;
       }
 
       gfx::Rect crtc_bounds(crtc->x, crtc->y, crtc->width, crtc->height);
       gfx::Display display(display_id, crtc_bounds);
@@ skipping 25 matching lines @@
           break;
         case RR_Rotate_180:
           display.set_rotation(gfx::Display::ROTATE_180);
           break;
         case RR_Rotate_270:
           display.set_rotation(gfx::Display::ROTATE_270);
           break;
       }
 
       displays.push_back(display);
-
-      XRRFreeCrtcInfo(crtc);
     }
-
-    XRRFreeOutputInfo(output_info);
   }
 
-  XRRFreeScreenResources(resources);
-
   if (displays.empty())
     return GetFallbackDisplayList();
 
   return displays;
 }
 
 void DesktopScreenX11::ConfigureTimerFired() {
   std::vector<gfx::Display> old_displays = displays_;
   displays_ = BuildDisplaysFromXRandRInfo();
 
   change_notifier_.NotifyDisplaysChanged(old_displays, displays_);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 gfx::Screen* CreateDesktopScreen() {
   return new DesktopScreenX11;
 }
 
 }  // namespace views