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

content/content_common.gypi

 # 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.
 
 {
   'dependencies': [
     '../base/base.gyp:base',
     '../components/tracing.gyp:tracing',
     '../gpu/command_buffer/command_buffer.gyp:gles2_utils',
     '../net/net.gyp:net',
@@ skipping 704 matching lines @@
     ['use_x11 == 1', {
       'include_dirs': [
         '<(DEPTH)/third_party/khronos',
       ],
       'dependencies': [
          '<(DEPTH)/build/linux/system.gyp:xcomposite',
       ],
     }],
     ['use_x11 == 1 and (target_arch != "arm" or chromeos == 0)', {
       'sources': [
-        'common/gpu/x_util.cc',
         'common/gpu/x_util.h',
       ],
     }],
     ['enable_plugins==1', {
       'dependencies': [
         '../ppapi/ppapi_internal.gyp:ppapi_shared',
       ],
     }, {  # enable_plugins == 0
       'sources!': [
         'common/pepper_file_util.cc',
@@ skipping 307 matching lines @@
         'common/gpu/client/gpu_memory_buffer_impl_ozone.cc',
         'common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.cc',
         'common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.h',
         'common/gpu/gpu_memory_buffer_factory_ozone.cc',
         'common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc',
         'common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.h',
       ],
     }],
   ],
 }