Index: chrome/browser/extensions/webstore_inline_installer_browsertest.cc |
diff --git a/chrome/browser/extensions/webstore_inline_installer_browsertest.cc b/chrome/browser/extensions/webstore_inline_installer_browsertest.cc |
index eba0821c6d4b1292d5f1d49e3015ef8ecd8cb6be..d6c561dc0e1c8373c2ff087088ca128ec4082b7f 100644 |
--- a/chrome/browser/extensions/webstore_inline_installer_browsertest.cc |
+++ b/chrome/browser/extensions/webstore_inline_installer_browsertest.cc |
@@ -2,13 +2,15 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
+#include "chrome/browser/extensions/webstore_inline_installer.h" |
+ |
#include "base/macros.h" |
+#include "base/memory/ptr_util.h" |
#include "base/strings/utf_string_conversions.h" |
#include "chrome/browser/content_settings/host_content_settings_map_factory.h" |
#include "chrome/browser/extensions/extension_install_prompt.h" |
#include "chrome/browser/extensions/extension_service.h" |
#include "chrome/browser/extensions/tab_helper.h" |
-#include "chrome/browser/extensions/webstore_inline_installer.h" |
#include "chrome/browser/extensions/webstore_inline_installer_factory.h" |
#include "chrome/browser/extensions/webstore_installer_test.h" |
#include "chrome/browser/extensions/webstore_standalone_installer.h" |
@@ -71,8 +73,8 @@ class ProgrammableInstallPrompt : public ExtensionInstallPrompt { |
const ExtensionInstallPrompt::DoneCallback& done_callback, |
const Extension* extension, |
const SkBitmap* icon, |
- scoped_ptr<ExtensionInstallPrompt::Prompt> prompt, |
- scoped_ptr<const extensions::PermissionSet> custom_permissions, |
+ std::unique_ptr<ExtensionInstallPrompt::Prompt> prompt, |
+ std::unique_ptr<const extensions::PermissionSet> custom_permissions, |
const ShowDialogCallback& show_dialog_callback) override { |
done_callback_ = done_callback; |
g_done_callback = &done_callback_; |
@@ -118,9 +120,9 @@ class WebstoreInlineInstallerForTest : public WebstoreInlineInstaller { |
install_result_target_(nullptr), |
programmable_prompt_(nullptr) {} |
- scoped_ptr<ExtensionInstallPrompt> CreateInstallUI() override { |
+ std::unique_ptr<ExtensionInstallPrompt> CreateInstallUI() override { |
programmable_prompt_ = new ProgrammableInstallPrompt(web_contents()); |
- return make_scoped_ptr(programmable_prompt_); |
+ return base::WrapUnique(programmable_prompt_); |
} |
// Added here to make it public so that test cases can call it below. |
@@ -131,7 +133,7 @@ class WebstoreInlineInstallerForTest : public WebstoreInlineInstaller { |
// Tests that care about the actual arguments to the install callback can use |
// this to receive a copy in |install_result_target|. |
void set_install_result_target( |
- scoped_ptr<InstallResult>* install_result_target) { |
+ std::unique_ptr<InstallResult>* install_result_target) { |
install_result_target_ = install_result_target; |
} |
@@ -153,7 +155,7 @@ class WebstoreInlineInstallerForTest : public WebstoreInlineInstaller { |
// This can be set by tests that want to get the actual install callback |
// arguments. |
- scoped_ptr<InstallResult>* install_result_target_; |
+ std::unique_ptr<InstallResult>* install_result_target_; |
ProgrammableInstallPrompt* programmable_prompt_; |
}; |
@@ -225,7 +227,7 @@ IN_PROC_BROWSER_TEST_F(WebstoreInlineInstallerTest, |
// implement). If we ever do change things to kill the prompt in this case, |
// the following code can be removed (it verifies that clicking ok on the |
// dialog does not result in an install). |
- scoped_ptr<InstallResult> install_result; |
+ std::unique_ptr<InstallResult> install_result; |
factory->last_installer()->set_install_result_target(&install_result); |
ASSERT_TRUE(ProgrammableInstallPrompt::Ready()); |
ProgrammableInstallPrompt::Accept(); |