views_unittests: Fix FocusTraversalTest's BorderView::widget_ deletion.

ui/views/focus/focus_traversal_unittest.cc

 // 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.
 
 #include <stddef.h>
 
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/base/models/combobox_model.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/button/md_text_button.h"
 #include "ui/views/controls/button/radio_button.h"
@@ skipping 107 matching lines @@
 
  private:
   FocusSearch* focus_search_;
 };
 
 // BorderView is a view containing a native window with its own view hierarchy.
 // It is interesting to test focus traversal from a view hierarchy to an inner
 // view hierarchy.
 class BorderView : public NativeViewHost {
  public:
-  explicit BorderView(View* child) : child_(child), widget_(NULL) {
+  explicit BorderView(View* child) : child_(child) {
     DCHECK(child);
     SetFocusBehavior(FocusBehavior::NEVER);
   }
 
-  ~BorderView() override {
-    // TODO: ifdef should not be necessary. NativeWidgetMac has different
-    // ownership semantics: http://crbug.com/663418.
-#if !defined(OS_MACOSX)
-    if (widget_)
-      widget_->CloseNow();
-#endif
-  }
-
   virtual internal::RootView* GetContentsRootView() {
     return static_cast<internal::RootView*>(widget_->GetRootView());
   }
 
   FocusTraversable* GetFocusTraversable() override {
     return static_cast<internal::RootView*>(widget_->GetRootView());
   }
 
   void ViewHierarchyChanged(
       const ViewHierarchyChangedDetails& details) override {
     NativeViewHost::ViewHierarchyChanged(details);
 
     if (details.child == this && details.is_add) {
       if (!widget_) {
-        widget_ = new Widget;
+        widget_ = base::MakeUnique<Widget>();
         Widget::InitParams params(Widget::InitParams::TYPE_CONTROL);
         params.parent = details.parent->GetWidget()->GetNativeView();
+        params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
         widget_->Init(params);
         widget_->SetFocusTraversableParentView(this);
         widget_->SetContentsView(child_);
       }
 
       // We have been added to a view hierarchy, attach the native view.
       Attach(widget_->GetNativeView());
       // Also update the FocusTraversable parent so the focus traversal works.
       static_cast<internal::RootView*>(widget_->GetRootView())->
           SetFocusTraversableParent(GetWidget()->GetFocusTraversable());
     }
   }
 
  private:
   View* child_;
-  Widget* widget_;
+  std::unique_ptr<Widget> widget_;
 
   DISALLOW_COPY_AND_ASSIGN(BorderView);
 };
 
 }  // namespace
 
 class FocusTraversalTest : public FocusManagerTest {
  public:
   ~FocusTraversalTest() override;
 
@@ skipping 694 matching lines @@
   GetFocusManager()->AdvanceFocus(false);
   EXPECT_FALSE(GetFocusManager()->GetFocusedView());
 
   // Advance backwards from the root node.
   GetFocusManager()->ClearFocus();
   GetFocusManager()->AdvanceFocus(true);
   EXPECT_FALSE(GetFocusManager()->GetFocusedView());
 }
 
 }  // namespace views