Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr

chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <utility>
@@ skipping 147 matching lines @@
 - (void)chevronItemSelected:(id)menuItem;
 
 // Updates the container's grippy cursor based on the number of hidden buttons.
 - (void)updateGrippyCursors;
 
 // Returns the associated ToolbarController.
 - (ToolbarController*)toolbarController;
 
 // Creates a message bubble with the given |delegate| that is anchored to the
 // given |anchorView|.
-- (ToolbarActionsBarBubbleMac*)createMessageBubble:
-    (scoped_ptr<ToolbarActionsBarBubbleDelegate>)delegate
-    anchorView:(NSView*)anchorView;
+- (ToolbarActionsBarBubbleMac*)
+createMessageBubble:(std::unique_ptr<ToolbarActionsBarBubbleDelegate>)delegate
+         anchorView:(NSView*)anchorView;
 
 // Called when the window for the active bubble is closing, and sets the active
 // bubble to nil.
 - (void)bubbleWindowClosing:(NSNotification*)notification;
 
 // Sets the current focused view. Should only be used for the overflow
 // container.
 - (void)setFocusedViewIndex:(NSInteger)index;
 
 @end
@@ skipping 29 matching lines @@
   void Redraw(bool order_changed) override;
   void ResizeAndAnimate(gfx::Tween::Type tween_type,
                         int target_width,
                         bool suppress_chevron) override;
   void SetChevronVisibility(bool chevron_visible) override;
   int GetWidth(GetWidthTime get_width_time) const override;
   bool IsAnimating() const override;
   void StopAnimating() override;
   int GetChevronWidth() const override;
   void ShowExtensionMessageBubble(
-      scoped_ptr<extensions::ExtensionMessageBubbleController> controller,
+      std::unique_ptr<extensions::ExtensionMessageBubbleController> controller,
       ToolbarActionViewController* anchor_action) override;
   void ShowToolbarActionBubble(
-      scoped_ptr<ToolbarActionsBarBubbleDelegate> bubble) override;
+      std::unique_ptr<ToolbarActionsBarBubbleDelegate> bubble) override;
 
   // The owning BrowserActionsController; weak.
   BrowserActionsController* controller_;
 
   DISALLOW_COPY_AND_ASSIGN(ToolbarActionsBarBridge);
 };
 
 ToolbarActionsBarBridge::ToolbarActionsBarBridge(
     BrowserActionsController* controller)
     : controller_(controller) {
@@ skipping 52 matching lines @@
   // "animate" to the current frame.
   [controller_ resizeContainerToWidth:
       NSWidth([[controller_ containerView] frame])];
 }
 
 int ToolbarActionsBarBridge::GetChevronWidth() const {
   return kChevronWidth;
 }
 
 void ToolbarActionsBarBridge::ShowExtensionMessageBubble(
-    scoped_ptr<extensions::ExtensionMessageBubbleController> bubble_controller,
+    std::unique_ptr<extensions::ExtensionMessageBubbleController>
+        bubble_controller,
     ToolbarActionViewController* anchor_action) {
   NSView* anchorView = nil;
   BOOL anchoredToAction = NO;
   if (anchor_action) {
     BrowserActionButton* actionButton =
         [controller_ buttonForId:anchor_action->GetId()];
     if (actionButton && [actionButton superview]) {
       anchorView = actionButton;
       anchoredToAction = YES;
     }
   }
   if (!anchorView)
     anchorView = [[controller_ toolbarController] appMenuButton];
 
   // This goop is a by-product of needing to wire together abstract classes,
   // C++/Cocoa bridges, and ExtensionMessageBubbleController's somewhat strange
   // Show() interface. It's ugly, but it's pretty confined, so it's probably
   // okay (but if we ever need to expand, it might need to be reconsidered).
   extensions::ExtensionMessageBubbleController* weak_controller =
       bubble_controller.get();
-  scoped_ptr<ExtensionMessageBubbleBridge> bridge(
+  std::unique_ptr<ExtensionMessageBubbleBridge> bridge(
       new ExtensionMessageBubbleBridge(std::move(bubble_controller),
                                        anchoredToAction));
   ToolbarActionsBarBubbleMac* bubble =
       [controller_ createMessageBubble:std::move(bridge)
                             anchorView:anchorView];
   weak_controller->OnShown();
   [bubble showWindow:nil];
 }
 
 void ToolbarActionsBarBridge::ShowToolbarActionBubble(
-      scoped_ptr<ToolbarActionsBarBubbleDelegate> bubble) {
+    std::unique_ptr<ToolbarActionsBarBubbleDelegate> bubble) {
   NSView* anchorView = nil;
   if (!bubble->GetAnchorActionId().empty()) {
     BrowserActionButton* button =
         [controller_ buttonForId:bubble->GetAnchorActionId()];
     anchorView = button && [button superview] ? button :
         [[controller_ toolbarController] appMenuButton];
   } else {
     anchorView = [controller_ containerView];
   }
 
@@ skipping 249 matching lines @@
              name:kBrowserActionButtonDraggingNotification
            object:newButton];
 
   [containerView_ setMaxDesiredWidth:toolbarActionsBar_->GetMaximumWidth()];
 }
 
 - (void)redraw {
   if (![self updateContainerVisibility])
     return;  // Container is hidden; no need to update.
 
-  scoped_ptr<ui::NinePartImageIds> highlight;
+  std::unique_ptr<ui::NinePartImageIds> highlight;
   if (toolbarActionsBar_->is_highlighting()) {
     if (toolbarActionsBar_->highlight_type() ==
         ToolbarActionsModel::HIGHLIGHT_INFO)
       highlight.reset(
           new ui::NinePartImageIds(IMAGE_GRID(IDR_TOOLBAR_ACTION_HIGHLIGHT)));
     else
       highlight.reset(
           new ui::NinePartImageIds(IMAGE_GRID(IDR_DEVELOPER_MODE_HIGHLIGHT)));
   }
   [containerView_ setHighlight:std::move(highlight)];
@@ skipping 428 matching lines @@
       setCanDragLeft:toolbarActionsBar_->GetIconCount() != [buttons_ count]];
   [containerView_ setCanDragRight:[self visibleButtonCount] > 0];
   [[containerView_ window] invalidateCursorRectsForView:containerView_];
 }
 
 - (ToolbarController*)toolbarController {
   return [[BrowserWindowController browserWindowControllerForWindow:
              browser_->window()->GetNativeWindow()] toolbarController];
 }
 
-- (ToolbarActionsBarBubbleMac*)createMessageBubble:
-    (scoped_ptr<ToolbarActionsBarBubbleDelegate>)delegate
-    anchorView:(NSView*)anchorView {
+- (ToolbarActionsBarBubbleMac*)
+createMessageBubble:(std::unique_ptr<ToolbarActionsBarBubbleDelegate>)delegate
+         anchorView:(NSView*)anchorView {
   DCHECK(anchorView);
   DCHECK_GE([buttons_ count], 0u);
   NSPoint anchor = [self popupPointForView:anchorView
                                 withBounds:[anchorView bounds]];
 
   anchor = ui::ConvertPointFromWindowToScreen([containerView_ window], anchor);
   activeBubble_ = [[ToolbarActionsBarBubbleMac alloc]
       initWithParentWindow:[containerView_ window]
                anchorPoint:anchor
                   delegate:std::move(delegate)];
@@ skipping 15 matching lines @@
 }
 
 #pragma mark -
 #pragma mark Testing Methods
 
 - (BrowserActionButton*)buttonWithIndex:(NSUInteger)index {
   return index < [buttons_ count] ? [buttons_ objectAtIndex:index] : nil;
 }
 
 @end