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

ui/base/x/x11_util.h

 // 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.
 
 #ifndef UI_BASE_X_X11_UTIL_H_
 #define UI_BASE_X_X11_UTIL_H_
 
 // This file declares utility functions for X11 (Linux only).
 //
 // These functions do not require the Xlib headers to be included (which is why
@@ skipping 283 matching lines @@
 UI_BASE_EXPORT bool IsX11WindowFullScreen(XID window);
 
 // Returns true if the window manager supports the given hint.
 UI_BASE_EXPORT bool WmSupportsHint(XAtom atom);
 
 // Manages a piece of X11 allocated memory as a RefCountedMemory segment. This
 // object takes ownership over the passed in memory and will free it with the
 // X11 allocator when done.
 class UI_BASE_EXPORT XRefcountedMemory : public base::RefCountedMemory {
  public:
-  XRefcountedMemory(unsigned char* x11_data, size_t length)
-      : x11_data_(length ? x11_data : NULL), length_(length) {}
+  XRefcountedMemory(unsigned char* x11_data, size_t length);
 
   // Overridden from RefCountedMemory:
   const unsigned char* front() const override;
   size_t size() const override;
 
  private:
   ~XRefcountedMemory() override;
 
-  unsigned char* x11_data_;
+  gfx::XScopedPtr<unsigned char> x11_data_;
   size_t length_;
 
   DISALLOW_COPY_AND_ASSIGN(XRefcountedMemory);
 };
 
-// Keeps track of a string returned by an X function (e.g. XGetAtomName) and
-// makes sure it's XFree'd.
-class UI_BASE_EXPORT XScopedString {
- public:
-  explicit XScopedString(char* str) : string_(str) {}
-  ~XScopedString();
-
-  const char* string() const { return string_; }
-
- private:
-  char* string_;
-
-  DISALLOW_COPY_AND_ASSIGN(XScopedString);
-};
-
 // Keeps track of an image returned by an X function (e.g. XGetImage) and
 // makes sure it's XDestroyImage'd.
 class UI_BASE_EXPORT XScopedImage {
  public:
   explicit XScopedImage(XImage* image) : image_(image) {}
   ~XScopedImage();
 
   XImage* get() const { return image_; }
 
   XImage* operator->() const { return image_; }
@@ skipping 30 matching lines @@
 UI_BASE_EXPORT void ResetXCursorCache();
 
 // Returns the cached XcursorImage for |cursor|.
 UI_BASE_EXPORT const XcursorImage* GetCachedXcursorImage(::Cursor cursor);
 
 }  // namespace test
 
 }  // namespace ui
 
 #endif  // UI_BASE_X_X11_UTIL_H_