Change Painter factory functions to unique_ptr

ui/views/controls/combobox/combobox.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 "ui/views/controls/combobox/combobox.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 410 matching lines @@
     Button::STATE_HOVERED,
     Button::STATE_PRESSED,
   };
   for (int i = 0; i < 2; i++) {
     for (size_t state_index = 0; state_index < arraysize(button_states);
          state_index++) {
       Button::ButtonState state = button_states[state_index];
       size_t num;
       bool focused = !!i;
       const int* ids = GetBodyButtonImageIds(focused, state, &num);
-      body_button_painters_[focused][state].reset(
-          Painter::CreateImageGridPainter(ids));
+      body_button_painters_[focused][state] =
+          Painter::CreateImageGridPainter(ids);
       menu_button_images_[focused][state] = GetMenuButtonImages(focused, state);
     }
   }
 
   text_button_->SetVisible(true);
   arrow_button_->SetVisible(true);
   AddChildView(text_button_);
   AddChildView(arrow_button_);
 
   // A layer is applied to make sure that canvas bounds are snapped to pixel
@@ skipping 103 matching lines @@
 void Combobox::OnEnabledChanged() {
   View::OnEnabledChanged();
   if (!UseMd())
     arrow_image_ = PlatformStyle::CreateComboboxArrow(enabled(), style_);
 }
 
 void Combobox::OnNativeThemeChanged(const ui::NativeTheme* theme) {
   if (!UseMd())
     return;
 
-  set_background(Background::CreateBackgroundPainter(
-      true, Painter::CreateSolidRoundRectPainter(
-                theme->GetSystemColor(
-                    ui::NativeTheme::kColorId_TextfieldDefaultBackground),
-                FocusableBorder::kCornerRadiusDp)));
+  set_background(
+      Background::CreateBackgroundPainter(Painter::CreateSolidRoundRectPainter(
+          theme->GetSystemColor(
+              ui::NativeTheme::kColorId_TextfieldDefaultBackground),
+          FocusableBorder::kCornerRadiusDp)));
 }
 
 int Combobox::GetRowCount() {
   return model()->GetItemCount();
 }
 
 int Combobox::GetSelectedRow() {
   return selected_index_;
 }
 
@@ skipping 438 matching lines @@
   const int kMdPaddingWidth = 8;
   int arrow_pad = UseMd() ? kMdPaddingWidth
                           : PlatformStyle::kComboboxNormalArrowPadding;
   int padding = style_ == STYLE_NORMAL
                     ? arrow_pad * 2
                     : kActionLeftPadding + kActionRightPadding;
   return ArrowSize().width() + padding;
 }
 
 }  // namespace views