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

Unified Diff: components/bubble/bubble_manager_mocks.h

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.cc ('k') | components/bubble/bubble_manager_mocks.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/bubble/bubble_manager_mocks.h
diff --git a/components/bubble/bubble_manager_mocks.h b/components/bubble/bubble_manager_mocks.h
index 99e24931cc87a290db1df8e68a1a86b13da57749..bf75653fa176f535ac085cde542310531c7a530c 100644
--- a/components/bubble/bubble_manager_mocks.h
+++ b/components/bubble/bubble_manager_mocks.h
@@ -5,6 +5,7 @@
#ifndef COMPONENTS_BUBBLE_BUBBLE_MANAGER_MOCKS_H_
#define COMPONENTS_BUBBLE_BUBBLE_MANAGER_MOCKS_H_
+#include <memory>
#include <utility>
#include "base/macros.h"
@@ -35,16 +36,16 @@ class MockBubbleDelegate : public BubbleDelegate {
~MockBubbleDelegate() override;
// Default bubble shows UI and closes when asked to close.
- static scoped_ptr<MockBubbleDelegate> Default();
+ static std::unique_ptr<MockBubbleDelegate> Default();
// Stubborn bubble shows UI and doesn't want to close.
- static scoped_ptr<MockBubbleDelegate> Stubborn();
+ static std::unique_ptr<MockBubbleDelegate> Stubborn();
MOCK_CONST_METHOD1(ShouldClose, bool(BubbleCloseReason reason));
MOCK_METHOD1(DidClose, void(BubbleCloseReason reason));
// A scoped_ptr can't be returned in MOCK_METHOD.
- scoped_ptr<BubbleUi> BuildBubbleUi() override {
+ std::unique_ptr<BubbleUi> BuildBubbleUi() override {
return std::move(bubble_ui_);
}
@@ -61,7 +62,7 @@ class MockBubbleDelegate : public BubbleDelegate {
MOCK_CONST_METHOD0(OwningFrame, const content::RenderFrameHost*());
private:
- scoped_ptr<MockBubbleUi> bubble_ui_;
+ std::unique_ptr<MockBubbleUi> bubble_ui_;
DISALLOW_COPY_AND_ASSIGN(MockBubbleDelegate);
};
« no previous file with comments | « components/bubble/bubble_manager.cc ('k') | components/bubble/bubble_manager_mocks.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698