Index: chrome/browser/extensions/api/inline_install_private/inline_install_private_api.cc |
diff --git a/chrome/browser/extensions/api/inline_install_private/inline_install_private_api.cc b/chrome/browser/extensions/api/inline_install_private/inline_install_private_api.cc |
index 45a28d77d1d6cf76e1fc91d5cd0032aa286a23c3..e85b190cece76961f2edf9f9dd3146ee912b23a4 100644 |
--- a/chrome/browser/extensions/api/inline_install_private/inline_install_private_api.cc |
+++ b/chrome/browser/extensions/api/inline_install_private/inline_install_private_api.cc |
@@ -5,6 +5,7 @@ |
#include "chrome/browser/extensions/api/inline_install_private/inline_install_private_api.h" |
#include "base/bind.h" |
+#include "base/memory/ptr_util.h" |
#include "base/strings/string_number_conversions.h" |
#include "chrome/browser/extensions/webstore_install_with_prompt.h" |
#include "chrome/browser/profiles/profile.h" |
@@ -32,7 +33,7 @@ class Installer : public WebstoreInstallWithPrompt { |
// webstore. |
const GURL& GetRequestorURL() const override { return requestor_url_; } |
- scoped_ptr<ExtensionInstallPrompt::Prompt> CreateInstallPrompt() |
+ std::unique_ptr<ExtensionInstallPrompt::Prompt> CreateInstallPrompt() |
const override; |
void OnManifestParsed() override; |
@@ -52,9 +53,9 @@ Installer::Installer(const std::string& id, |
Installer::~Installer() { |
} |
-scoped_ptr<ExtensionInstallPrompt::Prompt> Installer::CreateInstallPrompt() |
+std::unique_ptr<ExtensionInstallPrompt::Prompt> Installer::CreateInstallPrompt() |
const { |
- scoped_ptr<ExtensionInstallPrompt::Prompt> prompt( |
+ std::unique_ptr<ExtensionInstallPrompt::Prompt> prompt( |
new ExtensionInstallPrompt::Prompt( |
ExtensionInstallPrompt::INLINE_INSTALL_PROMPT)); |
prompt->SetWebstoreData(localized_user_count(), |
@@ -72,7 +73,7 @@ void Installer::OnManifestParsed() { |
} |
Manifest parsed_manifest(Manifest::INTERNAL, |
- make_scoped_ptr(manifest()->DeepCopy())); |
+ base::WrapUnique(manifest()->DeepCopy())); |
std::string manifest_error; |
std::vector<InstallWarning> warnings; |
@@ -99,7 +100,7 @@ InlineInstallPrivateInstallFunction:: |
ExtensionFunction::ResponseAction |
InlineInstallPrivateInstallFunction::Run() { |
typedef api::inline_install_private::Install::Params Params; |
- scoped_ptr<Params> params(Params::Create(*args_)); |
+ std::unique_ptr<Params> params(Params::Create(*args_)); |
if (!user_gesture()) |
return RespondNow(CreateResponse("Must be called with a user gesture", |