Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(459)

Unified Diff: components/bubble/bubble_manager_mocks.cc

Issue 1921973002: Convert //components/[a-e]* from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/bubble/bubble_manager_mocks.h ('k') | components/bubble/bubble_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
}
« no previous file with comments | « components/bubble/bubble_manager_mocks.h ('k') | components/bubble/bubble_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698