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

Unified Diff: components/bubble/bubble_manager_unittest.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.cc ('k') | components/captive_portal/captive_portal_detector.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/bubble/bubble_manager_unittest.cc
diff --git a/components/bubble/bubble_manager_unittest.cc b/components/bubble/bubble_manager_unittest.cc
index 625fe94ffe375299e7f0fe842b41efd557609448..0edc6781a56a6301fbfdce4ade94745d6d74ce87 100644
--- a/components/bubble/bubble_manager_unittest.cc
+++ b/components/bubble/bubble_manager_unittest.cc
@@ -4,9 +4,11 @@
#include "components/bubble/bubble_manager.h"
+#include <memory>
#include <utility>
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "components/bubble/bubble_controller.h"
#include "components/bubble/bubble_manager_mocks.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -21,7 +23,7 @@ class ChainShowBubbleDelegate : public MockBubbleDelegate {
// |chained_bubble| can be nullptr if not interested in getting a reference to
// the chained bubble.
ChainShowBubbleDelegate(BubbleManager* manager,
- scoped_ptr<BubbleDelegate> delegate,
+ std::unique_ptr<BubbleDelegate> delegate,
BubbleReference* chained_bubble)
: manager_(manager),
delegate_(std::move(delegate)),
@@ -42,7 +44,7 @@ class ChainShowBubbleDelegate : public MockBubbleDelegate {
private:
BubbleManager* manager_;
- scoped_ptr<BubbleDelegate> delegate_;
+ std::unique_ptr<BubbleDelegate> delegate_;
BubbleReference* chained_bubble_;
bool closed_;
@@ -96,7 +98,7 @@ class BubbleManagerTest : public testing::Test {
void TearDown() override;
protected:
- scoped_ptr<BubbleManagerSubclass> manager_;
+ std::unique_ptr<BubbleManagerSubclass> manager_;
private:
DISALLOW_COPY_AND_ASSIGN(BubbleManagerTest);
@@ -115,7 +117,7 @@ void BubbleManagerTest::TearDown() {
}
TEST_F(BubbleManagerTest, ManagerShowsBubbleUi) {
- scoped_ptr<MockBubbleDelegate> delegate = MockBubbleDelegate::Default();
+ std::unique_ptr<MockBubbleDelegate> delegate = MockBubbleDelegate::Default();
MockBubbleUi* bubble_ui = delegate->bubble_ui();
EXPECT_CALL(*bubble_ui, Destroyed());
@@ -127,7 +129,7 @@ TEST_F(BubbleManagerTest, ManagerShowsBubbleUi) {
}
TEST_F(BubbleManagerTest, ManagerUpdatesBubbleUiAnchor) {
- scoped_ptr<MockBubbleDelegate> delegate = MockBubbleDelegate::Default();
+ std::unique_ptr<MockBubbleDelegate> delegate = MockBubbleDelegate::Default();
MockBubbleUi* bubble_ui = delegate->bubble_ui();
EXPECT_CALL(*bubble_ui, Destroyed());
@@ -260,9 +262,9 @@ TEST_F(BubbleManagerTest, CloseBubbleShouldOnlylCloseSelf) {
}
TEST_F(BubbleManagerTest, CloseOwnedByShouldLeaveUnowned) {
- scoped_ptr<MockBubbleDelegate> delegate1 = MockBubbleDelegate::Default();
- scoped_ptr<MockBubbleDelegate> delegate2 = MockBubbleDelegate::Default();
- scoped_ptr<MockBubbleDelegate> delegate3 = MockBubbleDelegate::Default();
+ std::unique_ptr<MockBubbleDelegate> delegate1 = MockBubbleDelegate::Default();
+ std::unique_ptr<MockBubbleDelegate> delegate2 = MockBubbleDelegate::Default();
+ std::unique_ptr<MockBubbleDelegate> delegate3 = MockBubbleDelegate::Default();
MockBubbleDelegate& delegate1_ref = *delegate1;
MockBubbleDelegate& delegate2_ref = *delegate2;
MockBubbleDelegate& delegate3_ref = *delegate3;
@@ -320,7 +322,7 @@ TEST_F(BubbleManagerTest, CloseAllShouldWorkWithoutBubbles) {
TEST_F(BubbleManagerTest, AllowBubbleChainingOnClose) {
BubbleReference chained_bubble;
BubbleReference ref =
- manager_->ShowBubble(make_scoped_ptr(new ChainShowBubbleDelegate(
+ manager_->ShowBubble(base::WrapUnique(new ChainShowBubbleDelegate(
manager_.get(), MockBubbleDelegate::Default(), &chained_bubble)));
ASSERT_FALSE(chained_bubble); // Bubble not yet visible.
ASSERT_TRUE(manager_->CloseBubble(ref, BUBBLE_CLOSE_FORCED));
@@ -332,7 +334,7 @@ TEST_F(BubbleManagerTest, AllowBubbleChainingOnClose) {
TEST_F(BubbleManagerTest, AllowBubbleChainingOnCloseAll) {
BubbleReference chained_bubble;
BubbleReference ref =
- manager_->ShowBubble(make_scoped_ptr(new ChainShowBubbleDelegate(
+ manager_->ShowBubble(base::WrapUnique(new ChainShowBubbleDelegate(
manager_.get(), MockBubbleDelegate::Default(), &chained_bubble)));
ASSERT_FALSE(chained_bubble); // Bubble not yet visible.
manager_->CloseAllBubbles(BUBBLE_CLOSE_FORCED);
@@ -350,12 +352,12 @@ TEST_F(BubbleManagerTest, BubblesDoNotChainOnDestroy) {
EXPECT_CALL(metrics, OnBubbleClosed(testing::_, BUBBLE_CLOSE_FORCED));
manager_->AddBubbleManagerObserver(&metrics);
- scoped_ptr<MockBubbleDelegate> chained_delegate(new MockBubbleDelegate);
+ std::unique_ptr<MockBubbleDelegate> chained_delegate(new MockBubbleDelegate);
EXPECT_CALL(*chained_delegate->bubble_ui(), Show(testing::_)).Times(0);
EXPECT_CALL(*chained_delegate, ShouldClose(testing::_)).Times(0);
EXPECT_CALL(*chained_delegate, DidClose(testing::_)).Times(0);
- manager_->ShowBubble(make_scoped_ptr(new ChainShowBubbleDelegate(
+ manager_->ShowBubble(base::WrapUnique(new ChainShowBubbleDelegate(
manager_.get(), std::move(chained_delegate), nullptr)));
manager_.reset();
}
@@ -376,7 +378,7 @@ TEST_F(BubbleManagerTest, BubbleCloseReasonIsCalled) {
// In a close chain, it should be possible for the bubble in the second close
// event to close.
TEST_F(BubbleManagerTest, BubbleCloseChainCloseClose) {
- scoped_ptr<ChainCloseBubbleDelegate> closing_bubble(
+ std::unique_ptr<ChainCloseBubbleDelegate> closing_bubble(
new ChainCloseBubbleDelegate(manager_.get()));
EXPECT_CALL(*closing_bubble, ShouldClose(testing::_))
.WillOnce(testing::Return(true));
@@ -399,7 +401,7 @@ TEST_F(BubbleManagerTest, BubbleCloseChainCloseClose) {
// In a close chain, it should be possible for the bubble in the second close
// event to remain open because close is a request.
TEST_F(BubbleManagerTest, BubbleCloseChainCloseNoClose) {
- scoped_ptr<ChainCloseBubbleDelegate> closing_bubble(
+ std::unique_ptr<ChainCloseBubbleDelegate> closing_bubble(
new ChainCloseBubbleDelegate(manager_.get()));
EXPECT_CALL(*closing_bubble, ShouldClose(testing::_))
.WillOnce(testing::Return(true));
@@ -423,7 +425,7 @@ TEST_F(BubbleManagerTest, BubbleCloseChainCloseNoClose) {
// bubbles if it's closed, but it doesn't want to close. Sending a close request
// should keep it open without starting a close chain.
TEST_F(BubbleManagerTest, BubbleCloseChainNoCloseNoClose) {
- scoped_ptr<ChainCloseBubbleDelegate> closing_bubble(
+ std::unique_ptr<ChainCloseBubbleDelegate> closing_bubble(
new ChainCloseBubbleDelegate(manager_.get()));
EXPECT_CALL(*closing_bubble, ShouldClose(testing::_))
.WillRepeatedly(testing::Return(false));
« no previous file with comments | « components/bubble/bubble_manager_mocks.cc ('k') | components/captive_portal/captive_portal_detector.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698