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

chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.cc

 // Copyright 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 "chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.h"
 
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdkx.h>
 
@@ skipping 135 matching lines @@
 
 // private:
 
 void X11InputMethodContextImplGtk2::ResetXModifierKeycodesCache() {
   modifier_keycodes_.clear();
   meta_keycodes_.clear();
   super_keycodes_.clear();
   hyper_keycodes_.clear();
 
   Display* display = gfx::GetXDisplay();
-  const XModifierKeymap* modmap = XGetModifierMapping(display);
+  gfx::XScopedPtr<XModifierKeymap,
+                  gfx::XObjectDeleter<XModifierKeymap, int, XFreeModifiermap>>
+      modmap(XGetModifierMapping(display));
   int min_keycode = 0;
   int max_keycode = 0;
   int keysyms_per_keycode = 1;
   XDisplayKeycodes(display, &min_keycode, &max_keycode);
-  const KeySym* keysyms = XGetKeyboardMapping(
-      display, min_keycode, max_keycode - min_keycode + 1,
-      &keysyms_per_keycode);
+  gfx::XScopedPtr<KeySym[]> keysyms(
+      XGetKeyboardMapping(display, min_keycode, max_keycode - min_keycode + 1,
+                          &keysyms_per_keycode));
   for (int i = 0; i < 8 * modmap->max_keypermod; ++i) {
     const int keycode = modmap->modifiermap[i];
     if (!keycode)
       continue;
     modifier_keycodes_.insert(keycode);
 
     if (!keysyms)
       continue;
     for (int j = 0; j < keysyms_per_keycode; ++j) {
       switch (keysyms[(keycode - min_keycode) * keysyms_per_keycode + j]) {
         case XK_Meta_L:
         case XK_Meta_R:
           meta_keycodes_.push_back(keycode);
           break;
         case XK_Super_L:
         case XK_Super_R:
           super_keycodes_.push_back(keycode);
           break;
         case XK_Hyper_L:
         case XK_Hyper_R:
           hyper_keycodes_.push_back(keycode);
           break;
       }
     }
   }
-  XFree(const_cast<KeySym*>(keysyms));
-  XFreeModifiermap(const_cast<XModifierKeymap*>(modmap));
 }
 
 GdkEvent* X11InputMethodContextImplGtk2::GdkEventFromNativeEvent(
     const base::NativeEvent& native_event) {
   XEvent xkeyevent;
   if (native_event->type == GenericEvent) {
     // If this is an XI2 key event, build a matching core X event, to avoid
     // having two cases for every use.
     ui::InitXKeyEventFromXIDeviceEvent(*native_event, &xkeyevent);
   } else {
@@ skipping 180 matching lines @@
       text.length() == 1 &&
       text[0] == gdk_keyval_to_unicode(gdk_event_key_keyval_)) {
     is_signal_caught_ = true;
     return true;
   } else {
     return false;
   }
 }
 
 }  // namespace libgtk2ui