| Index: chrome/browser/ui/toolbar/test_toolbar_actions_bar_bubble_delegate.h
|
| diff --git a/chrome/browser/ui/toolbar/test_toolbar_actions_bar_bubble_delegate.h b/chrome/browser/ui/toolbar/test_toolbar_actions_bar_bubble_delegate.h
|
| index 9c1b411c18eb490a88bd557e83cf7ecf14319b09..96986a3d5568abc9c3a36fee56607d94a821f391 100644
|
| --- a/chrome/browser/ui/toolbar/test_toolbar_actions_bar_bubble_delegate.h
|
| +++ b/chrome/browser/ui/toolbar/test_toolbar_actions_bar_bubble_delegate.h
|
| @@ -5,8 +5,9 @@
|
| #ifndef CHROME_BROWSER_UI_TOOLBAR_TEST_TOOLBAR_ACTIONS_BAR_BUBBLE_DELEGATE_H_
|
| #define CHROME_BROWSER_UI_TOOLBAR_TEST_TOOLBAR_ACTIONS_BAR_BUBBLE_DELEGATE_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "chrome/browser/ui/toolbar/toolbar_actions_bar_bubble_delegate.h"
|
|
|
| // A test delegate for a bubble to hang off the toolbar actions bar.
|
| @@ -21,7 +22,7 @@ class TestToolbarActionsBarBubbleDelegate {
|
| // Returns a delegate to pass to the bubble. Since the bubble typically owns
|
| // the delegate, it means we can't have this object be the delegate, because
|
| // it would be deleted once the bubble closes.
|
| - scoped_ptr<ToolbarActionsBarBubbleDelegate> GetDelegate();
|
| + std::unique_ptr<ToolbarActionsBarBubbleDelegate> GetDelegate();
|
|
|
| void set_dismiss_button_text(const base::string16& dismiss) {
|
| dismiss_ = dismiss;
|
| @@ -45,7 +46,7 @@ class TestToolbarActionsBarBubbleDelegate {
|
| bool shown_;
|
|
|
| // The action that was taken to close the bubble.
|
| - scoped_ptr<ToolbarActionsBarBubbleDelegate::CloseAction> close_action_;
|
| + std::unique_ptr<ToolbarActionsBarBubbleDelegate::CloseAction> close_action_;
|
|
|
| // Strings for the bubble.
|
| base::string16 heading_;
|
|
|