Index: chrome/browser/ui/views/extensions/extension_install_dialog_view_browsertest.cc |
diff --git a/chrome/browser/ui/views/extensions/extension_install_dialog_view_browsertest.cc b/chrome/browser/ui/views/extensions/extension_install_dialog_view_browsertest.cc |
index 211d395b616610a5faf13c7a45f6e1a31aa6502e..e65a08d3ba8a9128751935ceaeab3da12466f061 100644 |
--- a/chrome/browser/ui/views/extensions/extension_install_dialog_view_browsertest.cc |
+++ b/chrome/browser/ui/views/extensions/extension_install_dialog_view_browsertest.cc |
@@ -43,8 +43,8 @@ class ExtensionInstallDialogViewTestBase : public ExtensionBrowserTest { |
// Creates and returns an install prompt of |prompt_type_|, optionally setting |
// |permissions|. |
- scoped_ptr<ExtensionInstallPrompt::Prompt> CreatePrompt(); |
- scoped_ptr<ExtensionInstallPrompt::Prompt> CreatePrompt( |
+ std::unique_ptr<ExtensionInstallPrompt::Prompt> CreatePrompt(); |
+ std::unique_ptr<ExtensionInstallPrompt::Prompt> CreatePrompt( |
const PermissionMessages& permissions); |
content::WebContents* web_contents() { return web_contents_; } |
@@ -70,13 +70,14 @@ void ExtensionInstallDialogViewTestBase::SetUpOnMainThread() { |
web_contents_ = browser()->tab_strip_model()->GetWebContentsAt(0); |
} |
-scoped_ptr<ExtensionInstallPrompt::Prompt> |
+std::unique_ptr<ExtensionInstallPrompt::Prompt> |
ExtensionInstallDialogViewTestBase::CreatePrompt() { |
- scoped_ptr<ExtensionInstallPrompt::Prompt> prompt( |
+ std::unique_ptr<ExtensionInstallPrompt::Prompt> prompt( |
new ExtensionInstallPrompt::Prompt(prompt_type_)); |
prompt->set_extension(extension_); |
- scoped_ptr<ExtensionIconManager> icon_manager(new ExtensionIconManager()); |
+ std::unique_ptr<ExtensionIconManager> icon_manager( |
+ new ExtensionIconManager()); |
const SkBitmap icon_bitmap = icon_manager->GetIcon(extension_->id()); |
gfx::Image icon = gfx::Image::CreateFrom1xBitmap(icon_bitmap); |
prompt->set_icon(icon); |
@@ -89,7 +90,8 @@ class ScrollbarTest : public ExtensionInstallDialogViewTestBase { |
ScrollbarTest(); |
~ScrollbarTest() override {} |
- bool IsScrollbarVisible(scoped_ptr<ExtensionInstallPrompt::Prompt> prompt); |
+ bool IsScrollbarVisible( |
+ std::unique_ptr<ExtensionInstallPrompt::Prompt> prompt); |
private: |
DISALLOW_COPY_AND_ASSIGN(ScrollbarTest); |
@@ -101,7 +103,7 @@ ScrollbarTest::ScrollbarTest() |
} |
bool ScrollbarTest::IsScrollbarVisible( |
- scoped_ptr<ExtensionInstallPrompt::Prompt> prompt) { |
+ std::unique_ptr<ExtensionInstallPrompt::Prompt> prompt) { |
ExtensionInstallDialogView* dialog = new ExtensionInstallDialogView( |
profile(), web_contents(), ExtensionInstallPrompt::DoneCallback(), |
std::move(prompt)); |
@@ -125,7 +127,7 @@ IN_PROC_BROWSER_TEST_F(ScrollbarTest, LongPromptScrollbar) { |
permissions.push_back(PermissionMessage(permission_string, |
PermissionIDSet())); |
} |
- scoped_ptr<ExtensionInstallPrompt::Prompt> prompt = CreatePrompt(); |
+ std::unique_ptr<ExtensionInstallPrompt::Prompt> prompt = CreatePrompt(); |
prompt->SetPermissions(permissions, |
ExtensionInstallPrompt::REGULAR_PERMISSIONS); |
ASSERT_TRUE(IsScrollbarVisible(std::move(prompt))) |
@@ -140,7 +142,7 @@ IN_PROC_BROWSER_TEST_F(ScrollbarTest, ScrollbarRegression) { |
PermissionMessages permissions; |
permissions.push_back(PermissionMessage(permission_string, |
PermissionIDSet())); |
- scoped_ptr<ExtensionInstallPrompt::Prompt> prompt = CreatePrompt(); |
+ std::unique_ptr<ExtensionInstallPrompt::Prompt> prompt = CreatePrompt(); |
prompt->SetPermissions(permissions, |
ExtensionInstallPrompt::REGULAR_PERMISSIONS); |
ASSERT_FALSE(IsScrollbarVisible(std::move(prompt))) << "Scrollbar is visible"; |
@@ -156,7 +158,7 @@ class ExtensionInstallDialogViewTest |
views::DialogDelegateView* CreateAndShowPrompt( |
ExtensionInstallPromptTestHelper* helper) { |
- scoped_ptr<ExtensionInstallDialogView> dialog( |
+ std::unique_ptr<ExtensionInstallDialogView> dialog( |
new ExtensionInstallDialogView(profile(), web_contents(), |
helper->GetCallback(), CreatePrompt())); |
views::DialogDelegateView* delegate_view = dialog.get(); |