chrome/browser/chromeos/extensions/wallpaper_api.cc - Issue 2065793002: Return a unique_ptr from BinaryValue::CreateWithCopiedBuffer.

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/chromeos/extensions/wallpaper_api.cc

Issue 2065793002: Return a unique_ptr from BinaryValue::CreateWithCopiedBuffer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix Android and CrOS Created 4 years, 6 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 | « base/values_unittest.cc ('k') | chrome/browser/chromeos/extensions/wallpaper_private_api.cc » ('j') | chrome/browser/extensions/api/audio_modem/audio_modem_api_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/extensions/wallpaper_api.cc

diff --git a/chrome/browser/chromeos/extensions/wallpaper_api.cc b/chrome/browser/chromeos/extensions/wallpaper_api.cc

index b7198e8162433471868f3165ff30427ddb465bec..7b0ed46b6a837dfe45b3ba828ffdaf1d8f342ddc 100644

--- a/chrome/browser/chromeos/extensions/wallpaper_api.cc

+++ b/chrome/browser/chromeos/extensions/wallpaper_api.cc

@@ -11,7 +11,6 @@

#include "ash/desktop_background/desktop_background_controller.h"

#include "base/files/file_util.h"

#include "base/lazy_instance.h"

-#include "base/memory/ptr_util.h"

#include "base/memory/ref_counted_memory.h"

#include "base/strings/stringprintf.h"

#include "base/threading/worker_pool.h"

@@ -230,16 +229,16 @@ void WallpaperSetWallpaperFunction::ThumbnailGenerated(

base::RefCountedBytes* original_data,

base::RefCountedBytes* thumbnail_data) {

std::unique_ptr<BinaryValue> original_result =

- base::WrapUnique(BinaryValue::CreateWithCopiedBuffer(

+ BinaryValue::CreateWithCopiedBuffer(

reinterpret_cast<const char*>(original_data->front()),

- original_data->size()));

+ original_data->size());

std::unique_ptr<BinaryValue> thumbnail_result =

- base::WrapUnique(BinaryValue::CreateWithCopiedBuffer(

+ BinaryValue::CreateWithCopiedBuffer(

reinterpret_cast<const char*>(thumbnail_data->front()),

- thumbnail_data->size()));

+ thumbnail_data->size());

if (params_->details.thumbnail) {

- SetResult(base::WrapUnique(thumbnail_result->DeepCopy()));

+ SetResult(thumbnail_result->CreateDeepCopy());

dcheng 2016/06/15 08:34:03 Strictly speaking, not directly related, but may a

SendResponse(true);

}