| Index: chrome/browser/extensions/api/content_settings/content_settings_api.cc
|
| diff --git a/chrome/browser/extensions/api/content_settings/content_settings_api.cc b/chrome/browser/extensions/api/content_settings/content_settings_api.cc
|
| index 007767ce8df36c63ae627b98532d40c8dac87a3c..4884025366f0c74dc0768bb43463860586f62e42 100644
|
| --- a/chrome/browser/extensions/api/content_settings/content_settings_api.cc
|
| +++ b/chrome/browser/extensions/api/content_settings/content_settings_api.cc
|
| @@ -4,12 +4,12 @@
|
|
|
| #include "chrome/browser/extensions/api/content_settings/content_settings_api.h"
|
|
|
| +#include <memory>
|
| #include <set>
|
| #include <vector>
|
|
|
| #include "base/bind.h"
|
| #include "base/command_line.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/strings/stringprintf.h"
|
| #include "base/values.h"
|
| #include "chrome/browser/content_settings/cookie_settings_factory.h"
|
| @@ -70,7 +70,7 @@ bool ContentSettingsContentSettingClearFunction::RunSync() {
|
| ContentSettingsType content_type;
|
| EXTENSION_FUNCTION_VALIDATE(RemoveContentType(args_.get(), &content_type));
|
|
|
| - scoped_ptr<Clear::Params> params(Clear::Params::Create(*args_));
|
| + std::unique_ptr<Clear::Params> params(Clear::Params::Create(*args_));
|
| EXTENSION_FUNCTION_VALIDATE(params.get());
|
|
|
| ExtensionPrefsScope scope = kExtensionPrefsScopeRegular;
|
| @@ -104,7 +104,7 @@ bool ContentSettingsContentSettingGetFunction::RunSync() {
|
| ContentSettingsType content_type;
|
| EXTENSION_FUNCTION_VALIDATE(RemoveContentType(args_.get(), &content_type));
|
|
|
| - scoped_ptr<Get::Params> params(Get::Params::Create(*args_));
|
| + std::unique_ptr<Get::Params> params(Get::Params::Create(*args_));
|
| EXTENSION_FUNCTION_VALIDATE(params.get());
|
|
|
| GURL primary_url(params->details.primary_url);
|
| @@ -180,7 +180,7 @@ bool ContentSettingsContentSettingSetFunction::RunSync() {
|
| ContentSettingsType content_type;
|
| EXTENSION_FUNCTION_VALIDATE(RemoveContentType(args_.get(), &content_type));
|
|
|
| - scoped_ptr<Set::Params> params(Set::Params::Create(*args_));
|
| + std::unique_ptr<Set::Params> params(Set::Params::Create(*args_));
|
| EXTENSION_FUNCTION_VALIDATE(params.get());
|
|
|
| std::string primary_error;
|
| @@ -309,7 +309,8 @@ void ContentSettingsContentSettingGetResourceIdentifiersFunction::OnGotPlugins(
|
| base::ListValue* list = new base::ListValue();
|
| for (std::vector<content::WebPluginInfo>::const_iterator it = plugins.begin();
|
| it != plugins.end(); ++it) {
|
| - scoped_ptr<PluginMetadata> plugin_metadata(finder->GetPluginMetadata(*it));
|
| + std::unique_ptr<PluginMetadata> plugin_metadata(
|
| + finder->GetPluginMetadata(*it));
|
| const std::string& group_identifier = plugin_metadata->identifier();
|
| if (group_identifiers.find(group_identifier) != group_identifiers.end())
|
| continue;
|
|
|