Return std::unique_ptr from ScrollView::CreateScrollViewWithBorder().

Bug: 966519
Change-Id: I9473da0496cfa56151773e1a218f55f8769a1419
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1627751
Commit-Queue: Allen Bauer <kylixrd@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#663106}

ash/login/ui/lock_debug_view.cc

@@ -740,8 +740,10 @@ LockDebugView::LockDebugView(mojom::TrayActionState initial_note_action_state,
       std::make_unique<views::BoxLayout>(views::BoxLayout::kVertical));
   UpdatePerUserActionContainer();
 
-  auto make_scroll = [](views::View* content, int height) -> views::View* {
-    views::ScrollView* scroll = views::ScrollView::CreateScrollViewWithBorder();
+  auto make_scroll = [](views::View* content,
+                        int height) -> std::unique_ptr<views::View> {
+    std::unique_ptr<views::ScrollView> scroll =
+        views::ScrollView::CreateScrollViewWithBorder();
     scroll->SetPreferredSize(gfx::Size(600, height));
     scroll->SetContents(base::WrapUnique(content));
     scroll->SetBackgroundColor(SK_ColorTRANSPARENT);

chrome/browser/ui/views/collected_cookies_views.cc

@@ -490,8 +490,8 @@ views::View* CollectedCookiesViews::CreateAllowedPane() {
   layout->StartRow(1.0, single_column_layout_id);
 
   allowed_cookies_tree_ = allowed_cookies_tree.get();
-  layout->AddView(CreateScrollView(std::move(allowed_cookies_tree)), 1, 1,
-                  views::GridLayout::FILL, views::GridLayout::FILL,
+  layout->AddView(CreateScrollView(std::move(allowed_cookies_tree)).release(),
+                  1, 1, views::GridLayout::FILL, views::GridLayout::FILL,
                   kTreeViewWidth, kTreeViewHeight);
   layout->AddPaddingRow(views::GridLayout::kFixedSize,
                         unrelated_vertical_distance);
@@ -557,8 +557,8 @@ views::View* CollectedCookiesViews::CreateBlockedPane() {
   layout->StartRow(1.0, single_column_layout_id);
 
   blocked_cookies_tree_ = blocked_cookies_tree.get();
-  layout->AddView(CreateScrollView(std::move(blocked_cookies_tree)), 1, 1,
-                  views::GridLayout::FILL, views::GridLayout::FILL,
+  layout->AddView(CreateScrollView(std::move(blocked_cookies_tree)).release(),
+                  1, 1, views::GridLayout::FILL, views::GridLayout::FILL,
                   kTreeViewWidth, kTreeViewHeight);
   layout->AddPaddingRow(views::GridLayout::kFixedSize,
                         unrelated_vertical_distance);
@@ -615,10 +615,9 @@ std::unique_ptr<views::View> CollectedCookiesViews::CreateButtonsPane() {
   return view;
 }
 
-views::View* CollectedCookiesViews::CreateScrollView(
+std::unique_ptr<views::View> CollectedCookiesViews::CreateScrollView(
     std::unique_ptr<views::TreeView> pane) {
-  views::ScrollView* scroll_view =
-      views::ScrollView::CreateScrollViewWithBorder();
+  auto scroll_view = views::ScrollView::CreateScrollViewWithBorder();
   scroll_view->SetContents(std::move(pane));
   return scroll_view;
 }

chrome/browser/ui/views/collected_cookies_views.h

@@ -85,7 +85,8 @@ class CollectedCookiesViews : public views::DialogDelegateView,
   std::unique_ptr<views::View> CreateButtonsPane();
 
   // Creates and returns a containing ScrollView around the given tree view.
-  views::View* CreateScrollView(std::unique_ptr<views::TreeView> pane);
+  std::unique_ptr<views::View> CreateScrollView(
+      std::unique_ptr<views::TreeView> pane);
 
   void EnableControls();
 

chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.cc

@@ -103,7 +103,7 @@ DesktopMediaPickerDialogView::DesktopMediaPickerDialogView(
             2,   // selection_border_thickness
             5);  // focus_rectangle_inset
 
-        views::ScrollView* screen_scroll_view =
+        std::unique_ptr<views::ScrollView> screen_scroll_view =
             views::ScrollView::CreateScrollViewWithBorder();
         base::string16 screen_title_text = l10n_util::GetStringUTF16(
             IDS_DESKTOP_MEDIA_PICKER_SOURCE_TYPE_SCREEN);
@@ -118,7 +118,7 @@ DesktopMediaPickerDialogView::DesktopMediaPickerDialogView(
             kGenericScreenStyle.item_size.height() * 2);
         screen_scroll_view->set_hide_horizontal_scrollbar(true);
 
-        pane_->AddTab(screen_title_text, screen_scroll_view);
+        pane_->AddTab(screen_title_text, screen_scroll_view.release());
         pane_->set_listener(this);
         break;
       }
@@ -135,7 +135,7 @@ DesktopMediaPickerDialogView::DesktopMediaPickerDialogView(
             2,                                     // selection_border_thickness
             5);                                    // focus_rectangle_inset
 
-        views::ScrollView* window_scroll_view =
+        std::unique_ptr<views::ScrollView> window_scroll_view =
             views::ScrollView::CreateScrollViewWithBorder();
         base::string16 window_title_text = l10n_util::GetStringUTF16(
             IDS_DESKTOP_MEDIA_PICKER_SOURCE_TYPE_WINDOW);
@@ -149,7 +149,7 @@ DesktopMediaPickerDialogView::DesktopMediaPickerDialogView(
                                          kWindowStyle.item_size.height() * 2);
         window_scroll_view->set_hide_horizontal_scrollbar(true);
 
-        pane_->AddTab(window_title_text, window_scroll_view);
+        pane_->AddTab(window_title_text, window_scroll_view.release());
         pane_->set_listener(this);
         break;
       }

chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc

@@ -116,14 +116,16 @@ void MediaGalleriesDialogViews::InitChildViews() {
   // Message text.
   const int vertical_padding =
       provider->GetDistanceMetric(views::DISTANCE_RELATED_CONTROL_VERTICAL);
-  views::Label* subtext = new views::Label(controller_->GetSubtext());
+  auto subtext = std::make_unique<views::Label>(controller_->GetSubtext());
   subtext->SetMultiLine(true);
   subtext->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+  // Get the height here rather than inline because the order of evaluation for
+  // parameters may differ between platforms.
+  const int subtext_height = subtext->GetHeightForWidth(dialog_content_width);
   layout->StartRow(views::GridLayout::kFixedSize, column_set_id);
-  layout->AddView(
-      subtext, 1, 1,
-      views::GridLayout::FILL, views::GridLayout::LEADING,
-      dialog_content_width, subtext->GetHeightForWidth(dialog_content_width));
+  layout->AddView(subtext.release(), 1, 1, views::GridLayout::FILL,
+                  views::GridLayout::LEADING, dialog_content_width,
+                  subtext_height);
   layout->AddPaddingRow(views::GridLayout::kFixedSize, vertical_padding);
 
   // Scrollable area for checkboxes.
@@ -143,17 +145,16 @@ void MediaGalleriesDialogViews::InitChildViews() {
 
     // Header and separator line.
     if (!section_headers[i].empty() && !entries.empty()) {
-      views::Separator* separator = new views::Separator();
-      scroll_container->AddChildView(separator);
+      scroll_container->AddChildView(std::make_unique<views::Separator>());
 
-      views::Label* header = new views::Label(section_headers[i]);
+      auto header = std::make_unique<views::Label>(section_headers[i]);
       header->SetMultiLine(true);
       header->SetHorizontalAlignment(gfx::ALIGN_LEFT);
       header->SetBorder(views::CreateEmptyBorder(
           vertical_padding,
           provider->GetInsetsMetric(views::INSETS_DIALOG).left(),
           vertical_padding, 0));
-      scroll_container->AddChildView(header);
+      scroll_container->AddChildView(std::move(header));
     }
 
     // Checkboxes.
@@ -168,11 +169,11 @@ void MediaGalleriesDialogViews::InitChildViews() {
 
   // Add the scrollable area to the outer dialog view. It will squeeze against
   // the title/subtitle and buttons to occupy all available space in the dialog.
-  auto* scroll_view = views::ScrollView::CreateScrollViewWithBorder();
+  auto scroll_view = views::ScrollView::CreateScrollViewWithBorder();
   scroll_view->SetContents(std::move(scroll_container));
   layout->StartRowWithPadding(1.0, column_set_id, views::GridLayout::kFixedSize,
                               vertical_padding);
-  layout->AddView(scroll_view, 1.0, 1.0, views::GridLayout::FILL,
+  layout->AddView(scroll_view.release(), 1.0, 1.0, views::GridLayout::FILL,
                   views::GridLayout::FILL, dialog_content_width,
                   kScrollAreaHeight);
 }

ui/views/controls/scroll_view.cc

@@ -224,8 +224,8 @@ ScrollView::~ScrollView() {
 }
 
 // static
-ScrollView* ScrollView::CreateScrollViewWithBorder() {
-  auto* scroll_view = new ScrollView();
+std::unique_ptr<ScrollView> ScrollView::CreateScrollViewWithBorder() {
+  auto scroll_view = std::make_unique<ScrollView>();
   scroll_view->AddBorder();
   return scroll_view;
 }

ui/views/controls/scroll_view.h

@@ -50,7 +50,7 @@ class VIEWS_EXPORT ScrollView : public View, public ScrollBarController {
   ~ScrollView() override;
 
   // Creates a ScrollView with a theme specific border.
-  static ScrollView* CreateScrollViewWithBorder();
+  static std::unique_ptr<ScrollView> CreateScrollViewWithBorder();
 
   // Returns the ScrollView for which |contents| is its contents, or null if
   // |contents| is not in a ScrollView.

ui/views/controls/table/table_view.cc

@@ -170,7 +170,7 @@ TableView::~TableView() {
 // static
 std::unique_ptr<ScrollView> TableView::CreateScrollViewWithTable(
     std::unique_ptr<TableView> table) {
-  auto scroll_view = base::WrapUnique(ScrollView::CreateScrollViewWithBorder());
+  auto scroll_view = ScrollView::CreateScrollViewWithBorder();
   auto* table_ptr = table.get();
   scroll_view->SetContents(std::move(table));
   table_ptr->CreateHeaderIfNecessary(scroll_view.get());

ui/views/controls/tree/tree_view.cc

@@ -115,7 +115,7 @@ TreeView::~TreeView() {
 // static
 std::unique_ptr<ScrollView> TreeView::CreateScrollViewWithTree(
     std::unique_ptr<TreeView> tree) {
-  auto scroll_view = base::WrapUnique(ScrollView::CreateScrollViewWithBorder());
+  auto scroll_view = ScrollView::CreateScrollViewWithBorder();
   scroll_view->SetContents(std::move(tree));
   return scroll_view;
 }