Return a unique_ptr from BinaryValue::CreateWithCopiedBuffer.

chrome/browser/chromeos/extensions/wallpaper_api.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/extensions/wallpaper_api.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
 #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"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/extensions/wallpaper_private_api.h"
 #include "chrome/browser/chromeos/file_manager/app_id.h"
 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_paths.h"
@@ skipping 198 matching lines @@
       BrowserThread::UI, FROM_HERE,
       base::Bind(&WallpaperSetWallpaperFunction::ThumbnailGenerated, this,
                  base::RetainedRef(original_data),
                  base::RetainedRef(thumbnail_data)));
 }
 
 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 as well save myself some
trouble down the road.

     SendResponse(true);
   }
 
   // Inform the native Wallpaper Picker Application that the current wallpaper
   // has been modified by a third party application.
   if (extension()->id() != extension_misc::kWallpaperManagerId) {
     Profile* profile = Profile::FromBrowserContext(browser_context());
     extensions::EventRouter* event_router =
         extensions::EventRouter::Get(profile);
     std::unique_ptr<base::ListValue> event_args(new base::ListValue());
@@ skipping 27 matching lines @@
     const std::string& response) {
   if (success) {
     params_->details.data.reset(
         new std::vector<char>(response.begin(), response.end()));
     StartDecode(*params_->details.data);
   } else {
     SetError(response);
     SendResponse(false);
   }
 }