Remove use of FillLayout in favor of View's default fill layout.

Bug: 1159116
Change-Id: I6a91ae027db7338b3b26c1d8a7af286490d8e748
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2594176
Commit-Queue: Allen Bauer <kylixrd@chromium.org>
Reviewed-by: Robert Liao <robliao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#838929}

chrome/browser/ui/views/collected_cookies_views.cc

@@ -528,7 +528,7 @@ std::unique_ptr<views::View> CollectedCookiesViews::CreateBlockedPane() {
 
 std::unique_ptr<views::View> CollectedCookiesViews::CreateButtonsPane() {
   auto view = std::make_unique<views::View>();
-  view->SetLayoutManager(std::make_unique<views::FillLayout>());
+  view->SetUseDefaultFillLayout(true);
 
   {
     auto allowed = std::make_unique<views::View>();

chrome/browser/ui/views/critical_notification_bubble_view.cc

@@ -117,7 +117,7 @@ void CriticalNotificationBubbleView::OnDialogAccepted() {
 void CriticalNotificationBubbleView::Init() {
   bubble_created_ = base::TimeTicks::Now();
 
-  SetLayoutManager(std::make_unique<views::FillLayout>());
+  SetUseDefaultFillLayout(true);
 
   auto message = std::make_unique<views::Label>(
       l10n_util::GetStringUTF16(IDS_CRITICAL_NOTIFICATION_TEXT),

chrome/browser/ui/views/device_chooser_content_view.cc

@@ -52,7 +52,7 @@ class BluetoothStatusContainer : public views::View {
 
 BluetoothStatusContainer::BluetoothStatusContainer(
     ChooserController* chooser_controller) {
-  SetLayoutManager(std::make_unique<views::FillLayout>());
+  SetUseDefaultFillLayout(true);
 
   auto* rescan_container = AddChildView(std::make_unique<views::View>());
   rescan_container
@@ -133,7 +133,7 @@ DeviceChooserContentView::DeviceChooserContentView(
   } else {
     // FillLayout is the default. There will only be the ScrollView,
     // therefore there's no point to have a BoxLayout.
-    SetLayoutManager(std::make_unique<views::FillLayout>());
+    SetUseDefaultFillLayout(true);
   }
 
   std::vector<ui::TableColumn> table_columns = {ui::TableColumn()};

chrome/browser/ui/views/download/download_danger_prompt_views.cc

@@ -106,14 +106,14 @@ DownloadDangerPromptViews::DownloadDangerPromptViews(
 
   set_margins(ChromeLayoutProvider::Get()->GetDialogInsetsForContentType(
       views::TEXT, views::TEXT));
-  SetLayoutManager(std::make_unique<views::FillLayout>());
+  SetUseDefaultFillLayout(true);
 
-  views::Label* message_body_label = new views::Label(GetMessageBody());
+  auto message_body_label = std::make_unique<views::Label>(GetMessageBody());
   message_body_label->SetMultiLine(true);
   message_body_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   message_body_label->SetAllowCharacterBreak(true);
 
-  AddChildView(message_body_label);
+  AddChildView(std::move(message_body_label));
 
   RecordOpenedDangerousConfirmDialog(download_->GetDangerType());
 

chrome/browser/ui/views/flying_indicator.cc

@@ -84,8 +84,8 @@ FlyingIndicator::FlyingIndicator(const gfx::VectorIcon& icon,
       gfx::CreateVectorIcon(kWebIcon, kIconSize, foreground_color));
   link_image->SetPreferredSize(gfx::Size(kBubbleSize, kBubbleSize));
 
-  // Use a fill layout because there's only one child view.
-  bubble_view->SetLayoutManager(std::make_unique<views::FillLayout>());
+  // Use the default fill layout because there's only one child view.
+  bubble_view->SetUseDefaultFillLayout(true);
 
   // Create the bubble.
   views::BubbleDialogDelegateView* const bubble_view_ptr = bubble_view.get();

chrome/browser/ui/views/folder_upload_confirmation_view.cc

@@ -50,14 +50,14 @@ FolderUploadConfirmationView::FolderUploadConfirmationView(
   set_fixed_width(views::LayoutProvider::Get()->GetDistanceMetric(
       views::DISTANCE_MODAL_DIALOG_PREFERRED_WIDTH));
 
-  SetLayoutManager(std::make_unique<views::FillLayout>());
+  SetUseDefaultFillLayout(true);
   auto label = std::make_unique<views::Label>(
       l10n_util::GetStringFUTF16(IDS_CONFIRM_FILE_UPLOAD_TEXT,
                                  path.BaseName().LossyDisplayName()),
       views::style::CONTEXT_DIALOG_BODY_TEXT, views::style::STYLE_SECONDARY);
   label->SetMultiLine(true);
   label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-  AddChildView(label.release());
+  AddChildView(std::move(label));
   set_margins(ChromeLayoutProvider::Get()->GetDialogInsetsForContentType(
       views::TEXT, views::TEXT));
 }

chrome/browser/ui/views/status_bubble_views.cc

@@ -229,7 +229,7 @@ StatusBubbleViews::StatusView::StatusView(StatusBubbleViews* status_bubble)
     : status_bubble_(status_bubble) {
   animation_ = std::make_unique<StatusViewAnimation>(this, 0, 0);
 
-  SetLayoutManager(std::make_unique<views::FillLayout>());
+  SetUseDefaultFillLayout(true);
 
   std::unique_ptr<views::Label> text = std::make_unique<views::Label>();
   // Don't move this after AddChildView() since this function would trigger

chrome/browser/ui/views/task_manager_view.cc

@@ -320,7 +320,7 @@ void TaskManagerView::Init() {
   tab_table_parent_ = AddChildView(
       views::TableView::CreateScrollViewWithTable(std::move(tab_table)));
 
-  SetLayoutManager(std::make_unique<views::FillLayout>());
+  SetUseDefaultFillLayout(true);
 
   const ChromeLayoutProvider* provider = ChromeLayoutProvider::Get();
   const gfx::Insets dialog_insets =