| Index: components/bubble/bubble_manager_mocks.cc
|
| diff --git a/components/bubble/bubble_manager_mocks.cc b/components/bubble/bubble_manager_mocks.cc
|
| index 724a54d63ae788468a210a4a65696f6d19aec773..74028c39bd431200d91104fafbd7ececb1ce59fb 100644
|
| --- a/components/bubble/bubble_manager_mocks.cc
|
| +++ b/components/bubble/bubble_manager_mocks.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "components/bubble/bubble_manager_mocks.h"
|
|
|
| +#include "base/memory/ptr_util.h"
|
| +
|
| MockBubbleUi::MockBubbleUi() {}
|
|
|
| MockBubbleUi::~MockBubbleUi() { Destroyed(); }
|
| @@ -13,22 +15,22 @@ MockBubbleDelegate::MockBubbleDelegate() : bubble_ui_(new MockBubbleUi) {}
|
| MockBubbleDelegate::~MockBubbleDelegate() { Destroyed(); }
|
|
|
| // static
|
| -scoped_ptr<MockBubbleDelegate> MockBubbleDelegate::Default() {
|
| +std::unique_ptr<MockBubbleDelegate> MockBubbleDelegate::Default() {
|
| MockBubbleDelegate* delegate = new MockBubbleDelegate;
|
| EXPECT_CALL(*delegate, ShouldClose(testing::_))
|
| .Times(testing::AtMost(1))
|
| .WillRepeatedly(testing::Return(true));
|
| EXPECT_CALL(*delegate, DidClose(testing::_));
|
| EXPECT_CALL(*delegate, Destroyed());
|
| - return make_scoped_ptr(delegate);
|
| + return base::WrapUnique(delegate);
|
| }
|
|
|
| // static
|
| -scoped_ptr<MockBubbleDelegate> MockBubbleDelegate::Stubborn() {
|
| +std::unique_ptr<MockBubbleDelegate> MockBubbleDelegate::Stubborn() {
|
| MockBubbleDelegate* delegate = new MockBubbleDelegate;
|
| EXPECT_CALL(*delegate, ShouldClose(testing::_))
|
| .WillRepeatedly(testing::Return(false));
|
| EXPECT_CALL(*delegate, DidClose(testing::_));
|
| EXPECT_CALL(*delegate, Destroyed());
|
| - return make_scoped_ptr(delegate);
|
| + return base::WrapUnique(delegate);
|
| }
|
|
|