Index: chrome/browser/ui/content_settings/content_setting_image_model.cc |
diff --git a/chrome/browser/ui/content_settings/content_setting_image_model.cc b/chrome/browser/ui/content_settings/content_setting_image_model.cc |
index 19da0d67c5073315c8e092983f222a5f0325a76f..a8b7c2ec4c5a283bf879385c488ba33e4e58fabc 100644 |
--- a/chrome/browser/ui/content_settings/content_setting_image_model.cc |
+++ b/chrome/browser/ui/content_settings/content_setting_image_model.cc |
@@ -5,6 +5,7 @@ |
#include "chrome/browser/ui/content_settings/content_setting_image_model.h" |
#include "base/macros.h" |
+#include "base/memory/ptr_util.h" |
#include "build/build_config.h" |
#include "chrome/browser/content_settings/host_content_settings_map_factory.h" |
#include "chrome/browser/content_settings/tab_specific_content_settings.h" |
@@ -228,19 +229,19 @@ void ContentSettingSimpleImageModel::SetAnimationHasRun( |
} |
// static |
-scoped_ptr<ContentSettingImageModel> |
- ContentSettingSimpleImageModel::CreateForContentTypeForTesting( |
- ContentSettingsType content_settings_type) { |
+std::unique_ptr<ContentSettingImageModel> |
+ContentSettingSimpleImageModel::CreateForContentTypeForTesting( |
+ ContentSettingsType content_settings_type) { |
if (content_settings_type == CONTENT_SETTINGS_TYPE_GEOLOCATION) |
- return make_scoped_ptr(new ContentSettingGeolocationImageModel()); |
+ return base::WrapUnique(new ContentSettingGeolocationImageModel()); |
if (content_settings_type == CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS) |
- return make_scoped_ptr(new ContentSettingRPHImageModel()); |
+ return base::WrapUnique(new ContentSettingRPHImageModel()); |
if (content_settings_type == CONTENT_SETTINGS_TYPE_MIDI_SYSEX) |
- return make_scoped_ptr(new ContentSettingMIDISysExImageModel()); |
+ return base::WrapUnique(new ContentSettingMIDISysExImageModel()); |
- return make_scoped_ptr( |
+ return base::WrapUnique( |
new ContentSettingBlockedImageModel(content_settings_type)); |
} |