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

ui/events/devices/x11/device_data_manager_x11.cc

 // Copyright 2014 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/events/devices/x11/device_data_manager_x11.h"
 
 #include <X11/extensions/XInput.h>
 #include <X11/extensions/XInput2.h>
 #include <X11/Xlib.h>
 
@@ skipping 196 matching lines @@
     valuator_count_[i] = 0;
     valuator_lookup_[i].clear();
     data_type_lookup_[i].clear();
     valuator_min_[i].clear();
     valuator_max_[i].clear();
     for (int j = 0; j < kMaxSlotNum; j++)
       last_seen_valuator_[i][j].clear();
   }
 
   // Find all the touchpad devices.
-  XDeviceList dev_list =
+  const XDeviceList& dev_list =
       ui::DeviceListCacheX11::GetInstance()->GetXDeviceList(display);
   Atom xi_touchpad = XInternAtom(display, XI_TOUCHPAD, false);
   for (int i = 0; i < dev_list.count; ++i)
     if (dev_list[i].type == xi_touchpad)
       touchpads_[dev_list[i].id] = true;
 
   if (!IsXInput2Available())
     return;
 
   // Update the structs with new valuator information
-  XIDeviceList info_list =
+  const XIDeviceList& info_list =
       ui::DeviceListCacheX11::GetInstance()->GetXI2DeviceList(display);
   Atom atoms[DT_LAST_ENTRY];
   for (int data_type = 0; data_type < DT_LAST_ENTRY; ++data_type)
     atoms[data_type] = atom_cache_.GetAtom(kCachedAtoms[data_type]);
 
   for (int i = 0; i < info_list.count; ++i) {
-    XIDeviceInfo* info = info_list.devices + i;
+    const XIDeviceInfo& info = info_list[i];
 
-    if (info->use == XIMasterPointer)
-      master_pointers_.push_back(info->deviceid);
+    if (info.use == XIMasterPointer)
+      master_pointers_.push_back(info.deviceid);
 
     // We currently handle only slave, non-keyboard devices
-    if (info->use != XISlavePointer && info->use != XIFloatingSlave)
+    if (info.use != XISlavePointer && info.use != XIFloatingSlave)
       continue;
 
     bool possible_cmt = false;
     bool not_cmt = false;
-    const int deviceid = info->deviceid;
+    const int deviceid = info.deviceid;
 
-    for (int j = 0; j < info->num_classes; ++j) {
-      if (info->classes[j]->type == XIValuatorClass)
+    for (int j = 0; j < info.num_classes; ++j) {
+      if (info.classes[j]->type == XIValuatorClass)
         ++valuator_count_[deviceid];
-      else if (info->classes[j]->type == XIScrollClass)
+      else if (info.classes[j]->type == XIScrollClass)
         not_cmt = true;
     }
 
     // Skip devices that don't use any valuator
     if (!valuator_count_[deviceid])
       continue;
 
     valuator_lookup_[deviceid].resize(DT_LAST_ENTRY, -1);
     data_type_lookup_[deviceid].resize(
         valuator_count_[deviceid], DT_LAST_ENTRY);
     valuator_min_[deviceid].resize(DT_LAST_ENTRY, 0);
     valuator_max_[deviceid].resize(DT_LAST_ENTRY, 0);
     for (int j = 0; j < kMaxSlotNum; j++)
       last_seen_valuator_[deviceid][j].resize(DT_LAST_ENTRY, 0);
-    for (int j = 0; j < info->num_classes; ++j) {
-      if (info->classes[j]->type != XIValuatorClass)
+    for (int j = 0; j < info.num_classes; ++j) {
+      if (info.classes[j]->type != XIValuatorClass)
         continue;
 
       XIValuatorClassInfo* v =
-          reinterpret_cast<XIValuatorClassInfo*>(info->classes[j]);
+          reinterpret_cast<XIValuatorClassInfo*>(info.classes[j]);
       for (int data_type = 0; data_type < DT_LAST_ENTRY; ++data_type) {
         if (v->label == atoms[data_type]) {
           valuator_lookup_[deviceid][data_type] = v->number;
           data_type_lookup_[deviceid][v->number] = data_type;
           valuator_min_[deviceid][data_type] = v->min;
           valuator_max_[deviceid][data_type] = v->max;
           if (IsCMTDataType(data_type))
             possible_cmt = true;
           break;
         }
@@ skipping 471 matching lines @@
     } else {
       keyboards.erase(it);
       ++blocked_iter;
     }
   }
   // Notify base class of updated list.
   DeviceDataManager::OnKeyboardDevicesUpdated(keyboards);
 }
 
 }  // namespace ui