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

Unified Diff: chrome/browser/ui/website_settings/mock_permission_bubble_factory.cc

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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
Index: chrome/browser/ui/website_settings/mock_permission_bubble_factory.cc
diff --git a/chrome/browser/ui/website_settings/mock_permission_bubble_factory.cc b/chrome/browser/ui/website_settings/mock_permission_bubble_factory.cc
index 35c1ebbe529526f95cdc791aa696dd4573ced8ed..dc935b4e6dbba9d3efa23c7805c9659bf8918899 100644
--- a/chrome/browser/ui/website_settings/mock_permission_bubble_factory.cc
+++ b/chrome/browser/ui/website_settings/mock_permission_bubble_factory.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/ui/website_settings/mock_permission_bubble_factory.h"
#include "base/bind.h"
+#include "base/memory/ptr_util.h"
#include "chrome/browser/ui/website_settings/mock_permission_bubble_view.h"
#include "chrome/browser/ui/website_settings/permission_bubble_manager.h"
@@ -31,12 +32,12 @@ MockPermissionBubbleFactory::~MockPermissionBubbleFactory() {
}
}
-scoped_ptr<PermissionBubbleView> MockPermissionBubbleFactory::Create(
+std::unique_ptr<PermissionBubbleView> MockPermissionBubbleFactory::Create(
Browser* browser) {
MockPermissionBubbleView* view =
new MockPermissionBubbleView(this, manager_, is_browser_test_);
view->can_update_ui_ = can_update_ui_;
- return make_scoped_ptr(view);
+ return base::WrapUnique(view);
}
void MockPermissionBubbleFactory::SetCanUpdateUi(bool can_update_ui) {
@@ -64,10 +65,11 @@ bool MockPermissionBubbleFactory::is_visible() {
}
// static
-scoped_ptr<PermissionBubbleView> MockPermissionBubbleFactory::DoNotCreate(
+std::unique_ptr<PermissionBubbleView> MockPermissionBubbleFactory::DoNotCreate(
Browser* browser) {
NOTREACHED();
- return make_scoped_ptr(new MockPermissionBubbleView(nullptr, nullptr, false));
+ return base::WrapUnique(
+ new MockPermissionBubbleView(nullptr, nullptr, false));
}
void MockPermissionBubbleFactory::UpdateResponseType() {

Powered by Google App Engine
This is Rietveld 408576698