Make various views SetShape() methods take an unique_ptr.

ui/views/widget/desktop_aura/desktop_window_tree_host_x11_unittest.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 <stddef.h>
 #include <X11/extensions/shape.h>
 #include <X11/Xlib.h>
 
 #include <memory>
 #include <vector>
@@ skipping 35 matching lines @@
 
 // Blocks till the window state hint, |hint|, is set or unset.
 class WMStateWaiter : public X11PropertyChangeWaiter {
  public:
   WMStateWaiter(XID window,
                 const char* hint,
                 bool wait_till_set)
       : X11PropertyChangeWaiter(window, "_NET_WM_STATE"),
         hint_(hint),
         wait_till_set_(wait_till_set) {
-
-    const char* kAtomsToCache[] = {
+    const char* const kAtomsToCache[] = {
         hint,
-        NULL
+        nullptr
     };
     atom_cache_.reset(new ui::X11AtomCache(gfx::GetXDisplay(), kAtomsToCache));
   }
 
   ~WMStateWaiter() override {}
 
  private:
   // X11PropertyChangeWaiter:
   bool ShouldKeepOnWaiting(const ui::PlatformEvent& event) override {
     std::vector<Atom> hints;
@@ skipping 13 matching lines @@
 
   // Whether we are waiting for |hint| to be set or unset.
   bool wait_till_set_;
 
   DISALLOW_COPY_AND_ASSIGN(WMStateWaiter);
 };
 
 // A NonClientFrameView with a window mask with the bottom right corner cut out.
 class ShapedNonClientFrameView : public NonClientFrameView {
  public:
-  explicit ShapedNonClientFrameView() {
+  ShapedNonClientFrameView() {
   }
 
   ~ShapedNonClientFrameView() override {}
 
   // NonClientFrameView:
   gfx::Rect GetBoundsForClientView() const override { return bounds(); }
   gfx::Rect GetWindowBoundsForClientBounds(
       const gfx::Rect& client_bounds) const override {
     return client_bounds;
   }
@@ skipping 176 matching lines @@
   // 2) Test setting the window shape via Widget::SetShape().
   gfx::Path shape2;
   shape2.moveTo(10, 0);
   shape2.lineTo(10, 10);
   shape2.lineTo(0, 10);
   shape2.lineTo(0, 100);
   shape2.lineTo(100, 100);
   shape2.lineTo(100, 0);
   shape2.close();
 
-  SkRegion* shape_region = new SkRegion;
+  auto shape_region = base::MakeUnique<SkRegion>();
   shape_region->setPath(shape2, SkRegion(shape2.getBounds().round()));
 
-  std::unique_ptr<Widget> widget2(CreateWidget(NULL));
+  std::unique_ptr<Widget> widget2(CreateWidget(nullptr));
   widget2->Show();
-  widget2->SetShape(shape_region);
+  widget2->SetShape(std::move(shape_region));
   ui::X11EventSource::GetInstance()->DispatchXEvents();
 
   XID xid2 = widget2->GetNativeWindow()->GetHost()->GetAcceleratedWidget();
   shape_rects = GetShapeRects(xid2);
   ASSERT_FALSE(shape_rects.empty());
   EXPECT_FALSE(ShapeRectContainsPoint(shape_rects, 5, 5));
   EXPECT_TRUE(ShapeRectContainsPoint(shape_rects, 15, 5));
   EXPECT_TRUE(ShapeRectContainsPoint(shape_rects, 95, 15));
   EXPECT_FALSE(ShapeRectContainsPoint(shape_rects, 105, 15));
 
@@ skipping 33 matching lines @@
   {
     WMStateWaiter waiter(xid, "_NET_WM_STATE_FULLSCREEN", true);
     widget->SetFullscreen(true);
     waiter.Wait();
   }
   EXPECT_TRUE(widget->IsFullscreen());
 
   // Emulate the window manager exiting fullscreen via a window manager
   // accelerator key. It should not affect the widget's fullscreen state.
   {
-    const char* kAtomsToCache[] = {
+    const char* const kAtomsToCache[] = {
         "_NET_WM_STATE",
         "_NET_WM_STATE_FULLSCREEN",
-        NULL
+        nullptr
     };
     Display* display = gfx::GetXDisplay();
     ui::X11AtomCache atom_cache(display, kAtomsToCache);
 
     XEvent xclient;
     memset(&xclient, 0, sizeof(xclient));
     xclient.type = ClientMessage;
     xclient.xclient.window = xid;
     xclient.xclient.message_type = atom_cache.GetAtom("_NET_WM_STATE");
     xclient.xclient.format = 32;
@@ skipping 27 matching lines @@
   params.native_widget = new DesktopNativeWidgetAura(&widget);
   widget.Init(params);
   widget.Show();
   ui::X11EventSource::GetInstance()->DispatchXEvents();
 
   XID xid = widget.GetNativeWindow()->GetHost()->GetAcceleratedWidget();
   Display* display = gfx::GetXDisplay();
 
   // Minimize by sending _NET_WM_STATE_HIDDEN
   {
-    const char* kAtomsToCache[] = {
+    const char* const kAtomsToCache[] = {
         "_NET_WM_STATE",
         "_NET_WM_STATE_HIDDEN",
-        NULL
+        nullptr
     };
 
     ui::X11AtomCache atom_cache(display, kAtomsToCache);
 
     std::vector< ::Atom> atom_list;
     atom_list.push_back(atom_cache.GetAtom("_NET_WM_STATE_HIDDEN"));
     ui::SetAtomArrayProperty(xid, "_NET_WM_STATE", "ATOM", atom_list);
 
     XEvent xevent;
     memset(&xevent, 0, sizeof(xevent));
     xevent.type = PropertyNotify;
     xevent.xproperty.type = PropertyNotify;
     xevent.xproperty.send_event = 1;
     xevent.xproperty.display = display;
     xevent.xproperty.window = xid;
     xevent.xproperty.atom = atom_cache.GetAtom("_NET_WM_STATE");
     xevent.xproperty.state = 0;
     XSendEvent(display, DefaultRootWindow(display), False,
         SubstructureRedirectMask | SubstructureNotifyMask,
         &xevent);
 
     WMStateWaiter waiter(xid, "_NET_WM_STATE_HIDDEN", true);
     waiter.Wait();
   }
   EXPECT_FALSE(widget.GetNativeWindow()->IsVisible());
 
   // Show from minimized by sending _NET_WM_STATE_FOCUSED
   {
-    const char* kAtomsToCache[] = {
+    const char* const kAtomsToCache[] = {
         "_NET_WM_STATE",
         "_NET_WM_STATE_FOCUSED",
-        NULL
+        nullptr
     };
 
     ui::X11AtomCache atom_cache(display, kAtomsToCache);
 
     std::vector< ::Atom> atom_list;
     atom_list.push_back(atom_cache.GetAtom("_NET_WM_STATE_FOCUSED"));
     ui::SetAtomArrayProperty(xid, "_NET_WM_STATE", "ATOM", atom_list);
 
     XEvent xevent;
     memset(&xevent, 0, sizeof(xevent));
@@ skipping 196 matching lines @@
   EXPECT_EQ(ui::ET_MOUSEWHEEL, second_recorder.mouse_events()[0].type());
   EXPECT_EQ(gfx::Point(-25, -25).ToString(),
             second_recorder.mouse_events()[0].location().ToString());
 
   PretendCapture(nullptr);
   first.GetNativeWindow()->RemovePreTargetHandler(&first_recorder);
   second.GetNativeWindow()->RemovePreTargetHandler(&second_recorder);
 }
 
 }  // namespace views