chrome/browser/ui/content_settings/content_setting_image_model.cc - Issue 2251263003: Re-write many calls to WrapUnique() with MakeUnique()

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/content_settings/content_setting_image_model.cc

Issue 2251263003: Re-write many calls to WrapUnique() with MakeUnique() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 4 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/cocoa/website_settings/permission_prompt_impl_views_mac.mm ('k') | chrome/browser/ui/extensions/extension_enable_flow.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 b0555dbb54c093dc106f5c1e7f801f5c4955e5fb..4acdf185dfbd8c5ee4be2ffe839334a8ea032b82 100644

--- a/chrome/browser/ui/content_settings/content_setting_image_model.cc

+++ b/chrome/browser/ui/content_settings/content_setting_image_model.cc

@@ -204,16 +204,16 @@ std::unique_ptr<ContentSettingImageModel>

ContentSettingSimpleImageModel::CreateForContentTypeForTesting(

ContentSettingsType content_settings_type) {

if (content_settings_type == CONTENT_SETTINGS_TYPE_GEOLOCATION)

- return base::WrapUnique(new ContentSettingGeolocationImageModel());

+ return base::MakeUnique<ContentSettingGeolocationImageModel>();

if (content_settings_type == CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS)

- return base::WrapUnique(new ContentSettingRPHImageModel());

+ return base::MakeUnique<ContentSettingRPHImageModel>();

if (content_settings_type == CONTENT_SETTINGS_TYPE_MIDI_SYSEX)

- return base::WrapUnique(new ContentSettingMIDISysExImageModel());

+ return base::MakeUnique<ContentSettingMIDISysExImageModel>();

- return base::WrapUnique(

- new ContentSettingBlockedImageModel(content_settings_type));

+ return base::MakeUnique<ContentSettingBlockedImageModel>(

+ content_settings_type);

}

// Generic blocked content settings --------------------------------------------