Change Painter factory functions to unique_ptr

chrome/browser/ui/views/toolbar/browser_actions_container.cc

 // Copyright 2013 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 "chrome/browser/ui/views/toolbar/browser_actions_container.h"
 
 #include <utility>
 
 #include "base/compiler_specific.h"
 #include "base/memory/ptr_util.h"
@@ skipping 77 matching lines @@
       animation_target_size_(0),
       active_bubble_(nullptr) {
   set_id(VIEW_ID_BROWSER_ACTION_TOOLBAR);
 
   if (!ShownInsideMenu()) {
     resize_animation_.reset(new gfx::SlideAnimation(this));
     resize_area_ = new views::ResizeArea(this);
     AddChildView(resize_area_);
 
     const int kWarningImages[] = IMAGE_GRID(IDR_DEVELOPER_MODE_HIGHLIGHT);
-    warning_highlight_painter_.reset(
-        views::Painter::CreateImageGridPainter(kWarningImages));
+    warning_highlight_painter_ =
+        views::Painter::CreateImageGridPainter(kWarningImages);
   }
 }
 
 BrowserActionsContainer::~BrowserActionsContainer() {
   if (active_bubble_)
     active_bubble_->GetWidget()->Close();
   // We should synchronously receive the OnWidgetClosing() event, so we should
   // always have cleared the active bubble by now.
   DCHECK(!active_bubble_);
 
@@ skipping 547 matching lines @@
   }
 }
 
 void BrowserActionsContainer::ClearActiveBubble(views::Widget* widget) {
   DCHECK(active_bubble_);
   DCHECK_EQ(active_bubble_->GetWidget(), widget);
   widget->RemoveObserver(this);
   active_bubble_ = nullptr;
   toolbar_actions_bar_->OnBubbleClosed();
 }