Use std::make_unique in ui/views/

Bug: chromium:996915
Change-Id: Idd0a9b3c8d01af0c53d0fc52576a64025e655542
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1769027
Commit-Queue: Robert Liao <robliao@chromium.org>
Commit-Queue: Peter Boström <pbos@chromium.org>
Reviewed-by: Robert Liao <robliao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#690005}

ui/views/cocoa/bridged_native_widget_interactive_uitest.mm

@@ -54,7 +54,7 @@ class BridgedNativeWidgetUITest : public WidgetTest {
     init_params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
     init_params.bounds = gfx::Rect(100, 100, 300, 200);
     init_params.delegate = new ResizableDelegateView;
-    widget_.reset(new Widget);
+    widget_ = std::make_unique<Widget>();
     widget_->Init(std::move(init_params));
   }
 

ui/views/cocoa/bridged_native_widget_unittest.mm

@@ -632,7 +632,7 @@ void BridgedNativeWidgetTest::SetHandleKeyEventCallback(
 void BridgedNativeWidgetTest::SetUp() {
   BridgedNativeWidgetTestBase::SetUp();
 
-  view_.reset(new views::internal::RootView(widget_.get()));
+  view_ = std::make_unique<views::internal::RootView>(widget_.get());
   base::scoped_nsobject<NSWindow> window([bridge_window() retain]);
 
   // The delegate should exist before setting the root view.
@@ -865,7 +865,7 @@ class BridgedNativeWidgetInitTest : public BridgedNativeWidgetTestBase {
 
   // Prepares a new |window_| and |widget_| for a call to PerformInit().
   void CreateNewWidgetToInit() {
-    widget_.reset(new Widget);
+    widget_ = std::make_unique<Widget>();
     native_widget_mac_ = new MockNativeWidgetMac(widget_.get());
   }
 

ui/views/cocoa/cocoa_mouse_capture_unittest.mm

@@ -39,7 +39,7 @@ class TestCaptureDelegate : public CocoaMouseCaptureDelegate {
   explicit TestCaptureDelegate(NSWindow* window)
       : event_count_(0), capture_lost_count_(0), window_(window) {}
 
-  void Acquire() { mouse_capture_.reset(new CocoaMouseCapture(this)); }
+  void Acquire() { mouse_capture_ = std::make_unique<CocoaMouseCapture>(this); }
   bool IsActive() { return mouse_capture_ && mouse_capture_->IsActive(); }
   void SimulateDestroy() { mouse_capture_.reset(); }
 

ui/views/cocoa/native_widget_mac_ns_window_host.mm

@@ -426,7 +426,7 @@ void NativeWidgetMacNSWindowHost::InitWindow(const Widget::InitParams& params) {
   // native on Mac, so nothing should ever want one in Widget form.
   DCHECK_NE(params.type, Widget::InitParams::TYPE_TOOLTIP);
   widget_type_ = params.type;
-  tooltip_manager_.reset(new TooltipManagerMac(GetNSWindowMojo()));
+  tooltip_manager_ = std::make_unique<TooltipManagerMac>(GetNSWindowMojo());
 
   // Initialize the window.
   {
@@ -530,8 +530,8 @@ void NativeWidgetMacNSWindowHost::SetRootView(views::View* root_view) {
   if (root_view_) {
     // TODO(ccameron): Drag-drop functionality does not yet run over mojo.
     if (in_process_ns_window_bridge_) {
-      drag_drop_client_.reset(new DragDropClientMac(
-          in_process_ns_window_bridge_.get(), root_view_));
+      drag_drop_client_ = std::make_unique<DragDropClientMac>(
+          in_process_ns_window_bridge_.get(), root_view_);
     }
   } else {
     drag_drop_client_.reset();

ui/views/controls/menu/menu_runner_cocoa_unittest.mm

@@ -98,7 +98,7 @@ class MenuRunnerCocoaTest : public ViewsTestBase,
     const int kWindowWidth = 300;
     ViewsTestBase::SetUp();
 
-    menu_.reset(new TestModel());
+    menu_ = std::make_unique<TestModel>();
     menu_->AddCheckItem(kTestCommandId, base::ASCIIToUTF16("Menu Item"));
 
     parent_ = new views::Widget();

ui/views/corewm/cursor_height_provider_win.cc

@@ -25,8 +25,8 @@ constexpr uint32_t kTransparentMask = 0xffffffff;
 constexpr int kDefaultHeight = 20;
 // Masks are monochromatic.
 constexpr size_t kNumberOfColors = 2;
-const size_t KHeaderAndPalette =
-      sizeof(BITMAPINFOHEADER) + kNumberOfColors * sizeof(RGBQUAD);
+const size_t kHeaderAndPalette =
+    sizeof(BITMAPINFOHEADER) + kNumberOfColors * sizeof(RGBQUAD);
 
 HeightStorage* cached_heights = nullptr;
 
@@ -40,10 +40,11 @@ PixelData GetBitmapData(HBITMAP handle, const BITMAPINFO& info, HDC hdc) {
 
   // When getting pixel data palette is appended to memory pointed by
   // BITMAPINFO passed so allocate additional memory to store additional data.
-  std::unique_ptr<char[]> header(new char[KHeaderAndPalette]);
+  auto header = std::make_unique<char[]>(kHeaderAndPalette);
   memcpy(header.get(), &(info.bmiHeader), sizeof(info.bmiHeader));
 
-  data.reset(new uint32_t[info.bmiHeader.biSizeImage / sizeof(uint32_t)]);
+  data = std::make_unique<uint32_t[]>(info.bmiHeader.biSizeImage /
+                                      sizeof(uint32_t));
 
   int result = GetDIBits(hdc,
                          handle,

ui/views/corewm/tooltip_controller_unittest.cc

@@ -95,8 +95,8 @@ class TooltipControllerTest : public ViewsTestBase {
 #if defined(OS_CHROMEOS) || defined(OS_WIN)
     if (root_window) {
       tooltip_aura_ = new views::corewm::TooltipAura();
-      controller_.reset(new TooltipController(
-          std::unique_ptr<views::corewm::Tooltip>(tooltip_aura_)));
+      controller_ = std::make_unique<TooltipController>(
+          std::unique_ptr<views::corewm::Tooltip>(tooltip_aura_));
       root_window->AddPreTargetHandler(controller_.get());
       SetTooltipClient(root_window, controller_.get());
     }

ui/views/test/event_generator_delegate_mac.mm

@@ -397,13 +397,14 @@ EventGeneratorDelegateMac::EventGeneratorDelegateMac(
                       withObject:[window.GetNativeNSWindow() firstResponder]];
 
   if (owner_) {
-    swizzle_pressed_.reset(new base::mac::ScopedObjCClassSwizzler(
-        [NSEvent class], [NSEventDonor class], @selector(pressedMouseButtons)));
-    swizzle_location_.reset(new base::mac::ScopedObjCClassSwizzler(
-        [NSEvent class], [NSEventDonor class], @selector(mouseLocation)));
-    swizzle_current_event_.reset(new base::mac::ScopedObjCClassSwizzler(
-        [NSApplication class], [NSApplicationDonor class],
-        @selector(currentEvent)));
+    swizzle_pressed_ = std::make_unique<base::mac::ScopedObjCClassSwizzler>(
+        [NSEvent class], [NSEventDonor class], @selector(pressedMouseButtons));
+    swizzle_location_ = std::make_unique<base::mac::ScopedObjCClassSwizzler>(
+        [NSEvent class], [NSEventDonor class], @selector(mouseLocation));
+    swizzle_current_event_ =
+        std::make_unique<base::mac::ScopedObjCClassSwizzler>(
+            [NSApplication class], [NSApplicationDonor class],
+            @selector(currentEvent));
   }
 }
 

ui/views/test/views_test_helper_mac.mm

@@ -48,10 +48,12 @@ void ViewsTestHelperMac::SetUp() {
   // activations and fullscreen mode. This allows interactive_ui_tests to test
   // the actual OS window activation and fullscreen codepaths.
   if (!ui_controls::IsUIControlsEnabled()) {
-    faked_focus_.reset(new ui::test::ScopedFakeNSWindowFocus);
-    faked_fullscreen_.reset(new ui::test::ScopedFakeNSWindowFullscreen);
+    faked_focus_ = std::make_unique<ui::test::ScopedFakeNSWindowFocus>();
+    faked_fullscreen_ =
+        std::make_unique<ui::test::ScopedFakeNSWindowFullscreen>();
   }
-  faked_full_keyboard_access_.reset(new ui::test::ScopedFakeFullKeyboardAccess);
+  faked_full_keyboard_access_ =
+      std::make_unique<ui::test::ScopedFakeFullKeyboardAccess>();
 }
 
 void ViewsTestHelperMac::TearDown() {

ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc

@@ -72,7 +72,7 @@ class DesktopScreenX11Test : public views::ViewsTestBase,
     // Initialize the world to the single monitor case.
     std::vector<display::Display> displays;
     displays.emplace_back(kFirstDisplay, gfx::Rect(0, 0, 640, 480));
-    screen_.reset(new DesktopScreenX11);
+    screen_ = std::make_unique<DesktopScreenX11>();
     UpdateDisplayListForTest(displays);
     screen_->AddObserver(this);
   }

ui/views/widget/native_widget_mac_interactive_uitest.mm

@@ -71,7 +71,7 @@ class NativeWidgetMacInteractiveUITest::Observer : public TestWidgetObserver {
 // Test that showing a window causes it to attain global keyWindow status.
 TEST_P(NativeWidgetMacInteractiveUITest, ShowAttainsKeyStatus) {
   Widget* widget = MakeWidget();
-  observer_.reset(new Observer(this, widget));
+  observer_ = std::make_unique<Observer>(this, widget);
 
   EXPECT_FALSE(widget->IsActive());
   EXPECT_EQ(0, activation_count_);

ui/views_content_client/views_content_client_main_parts.cc

@@ -33,7 +33,7 @@ void ViewsContentClientMainParts::PreCreateMainMessageLoop() {}
 void ViewsContentClientMainParts::PreMainMessageLoopRun() {
   ui::MaterialDesignController::Initialize();
   ui::InitializeInputMethodForTesting();
-  browser_context_.reset(new content::ShellBrowserContext(false));
+  browser_context_ = std::make_unique<content::ShellBrowserContext>(false);
 
   std::unique_ptr<views::TestViewsDelegate> test_views_delegate(
       new views::DesktopTestViewsDelegate);

ui/views_content_client/views_content_client_main_parts_aura.cc

@@ -20,7 +20,7 @@ ViewsContentClientMainPartsAura::~ViewsContentClientMainPartsAura() {
 void ViewsContentClientMainPartsAura::ToolkitInitialized() {
   ViewsContentClientMainParts::ToolkitInitialized();
 
-  wm_state_.reset(new ::wm::WMState);
+  wm_state_ = std::make_unique<::wm::WMState>();
 }
 
 void ViewsContentClientMainPartsAura::PostMainMessageLoopRun() {

ui/views_content_client/views_content_main_delegate.cc

@@ -88,7 +88,8 @@ void ViewsContentMainDelegate::PreCreateMainMessageLoop() {
 
 content::ContentBrowserClient*
     ViewsContentMainDelegate::CreateContentBrowserClient() {
-  browser_client_.reset(new ViewsContentBrowserClient(views_content_client_));
+  browser_client_ =
+      std::make_unique<ViewsContentBrowserClient>(views_content_client_);
   return browser_client_.get();
 }