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

ui/views/widget/desktop_aura/x11_topmost_window_finder_interactive_uitest.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/views/widget/desktop_aura/x11_topmost_window_finder.h"
 
 #include <algorithm>
 #include <vector>
 #include <X11/extensions/shape.h>
 #include <X11/Xlib.h>
@@ skipping 312 matching lines @@
   SkRegion* skregion1 = new SkRegion;
   skregion1->op(SkIRect::MakeXYWH(0, 10, 10, 90), SkRegion::kUnion_Op);
   skregion1->op(SkIRect::MakeXYWH(10, 0, 90, 100), SkRegion::kUnion_Op);
   // Widget takes ownership of |skregion1|.
   widget1->SetShape(skregion1);
 
   SkRegion skregion2;
   skregion2.op(SkIRect::MakeXYWH(0, 10, 10, 90), SkRegion::kUnion_Op);
   skregion2.op(SkIRect::MakeXYWH(10, 0, 90, 100), SkRegion::kUnion_Op);
   XID xid2 = CreateAndShowXWindow(gfx::Rect(300, 100, 100, 100));
-  REGION* region2 = gfx::CreateRegionFromSkRegion(skregion2);
-  XShapeCombineRegion(xdisplay(), xid2, ShapeBounding, 0, 0, region2,
-      false);
-  XDestroyRegion(region2);
-
+  gfx::XScopedPtr<REGION, gfx::XObjectDeleter<REGION, int, XDestroyRegion>>
+      region2(gfx::CreateRegionFromSkRegion(skregion2));
+  XShapeCombineRegion(xdisplay(), xid2, ShapeBounding, 0, 0, region2.get(),
+                      false);
   XID xids[] = { xid1, xid2 };
   StackingClientListWaiter stack_waiter(xids, arraysize(xids));
   stack_waiter.Wait();
   ui::X11EventSource::GetInstance()->DispatchXEvents();
 
   EXPECT_EQ(xid1, FindTopmostXWindowAt(105, 120));
   EXPECT_NE(xid1, FindTopmostXWindowAt(105, 105));
   EXPECT_NE(xid2, FindTopmostXWindowAt(105, 105));
 
   // Repeat test for an X window which does not belong to a views::Widget
@@ skipping 86 matching lines @@
 
   EXPECT_EQ(xid, FindTopmostXWindowAt(110, 110));
   EXPECT_EQ(menu_xid, FindTopmostXWindowAt(150, 120));
   EXPECT_EQ(menu_xid, FindTopmostXWindowAt(210, 120));
 
   XDestroyWindow(xdisplay(), xid);
   XDestroyWindow(xdisplay(), menu_xid);
 }
 
 }  // namespace views