Re-write many calls to WrapUnique() with MakeUnique()

chrome/browser/chromeos/policy/remote_commands/device_command_screenshot_job.cc

 // Copyright 2015 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/policy/remote_commands/device_command_screenshot_job.h"
 
 #include <fstream>
 #include <utility>
 
 #include "ash/shell.h"
@@ skipping 72 matching lines @@
 };
 
 DeviceCommandScreenshotJob::Payload::Payload(ResultCode result_code) {
   base::DictionaryValue root_dict;
   if (result_code != SUCCESS)
     root_dict.SetInteger(kResultFieldName, result_code);
   base::JSONWriter::Write(root_dict, &payload_);
 }
 
 std::unique_ptr<std::string> DeviceCommandScreenshotJob::Payload::Serialize() {
-  return base::WrapUnique(new std::string(payload_));
+  return base::MakeUnique<std::string>(payload_);
 }
 
 DeviceCommandScreenshotJob::DeviceCommandScreenshotJob(
     std::unique_ptr<Delegate> screenshot_delegate)
     : num_pending_screenshots_(0),
       screenshot_delegate_(std::move(screenshot_delegate)),
       weak_ptr_factory_(this) {
   DCHECK(screenshot_delegate_);
 }
 
 DeviceCommandScreenshotJob::~DeviceCommandScreenshotJob() {
 }
 
 enterprise_management::RemoteCommand_Type DeviceCommandScreenshotJob::GetType()
     const {
   return enterprise_management::RemoteCommand_Type_DEVICE_SCREENSHOT;
 }
 
 void DeviceCommandScreenshotJob::OnSuccess() {
   CHROMEOS_SYSLOG(WARNING) << "Upload successful.";
   base::ThreadTaskRunnerHandle::Get()->PostTask(
-      FROM_HERE,
-      base::Bind(succeeded_callback_,
-                 base::Passed(base::WrapUnique(new Payload(SUCCESS)))));
+      FROM_HERE, base::Bind(succeeded_callback_,
+                            base::Passed(base::MakeUnique<Payload>(SUCCESS))));
 }
 
 void DeviceCommandScreenshotJob::OnFailure(UploadJob::ErrorCode error_code) {
   CHROMEOS_SYSLOG(ERROR) << "Upload failure: " << error_code;
   ResultCode result_code = FAILURE_CLIENT;
   switch (error_code) {
     case UploadJob::AUTHENTICATION_ERROR:
       result_code = FAILURE_AUTHENTICATION;
       break;
     case UploadJob::NETWORK_ERROR:
     case UploadJob::SERVER_ERROR:
       result_code = FAILURE_SERVER;
       break;
   }
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE,
       base::Bind(failed_callback_,
-                 base::Passed(base::WrapUnique(new Payload(result_code)))));
+                 base::Passed(base::MakeUnique<Payload>(result_code))));
 }
 
 bool DeviceCommandScreenshotJob::IsExpired(base::TimeTicks now) {
   return now > issued_time() + base::TimeDelta::FromMinutes(
                                    kCommandExpirationTimeInMinutes);
 }
 
 bool DeviceCommandScreenshotJob::ParseCommandPayload(
     const std::string& command_payload) {
   std::unique_ptr<base::Value> root(
@@ skipping 23 matching lines @@
 
 void DeviceCommandScreenshotJob::StartScreenshotUpload() {
   for (const auto& screenshot_entry : screenshots_) {
     std::map<std::string, std::string> header_fields;
     header_fields.insert(
         std::make_pair(kFileTypeHeaderName, kFileTypeScreenshotFile));
     header_fields.insert(std::make_pair(net::HttpRequestHeaders::kContentType,
                                         kContentTypeImagePng));
     header_fields.insert(std::make_pair(kCommandIdHeaderName,
                                         base::Uint64ToString(unique_id())));
-    std::unique_ptr<std::string> data = base::WrapUnique(
-        new std::string((const char*)screenshot_entry.second->front(),
-                        screenshot_entry.second->size()));
+    std::unique_ptr<std::string> data = base::MakeUnique<std::string>(
+        (const char*)screenshot_entry.second->front(),
+        screenshot_entry.second->size());
     upload_job_->AddDataSegment(
         base::StringPrintf(kNameFieldTemplate, screenshot_entry.first),
         base::StringPrintf(kFilenameFieldTemplate, screenshot_entry.first),
         header_fields, std::move(data));
   }
   upload_job_->Start();
 }
 
 void DeviceCommandScreenshotJob::RunImpl(
     const CallbackWithResult& succeeded_callback,
     const CallbackWithResult& failed_callback) {
   succeeded_callback_ = succeeded_callback;
   failed_callback_ = failed_callback;
 
   CHROMEOS_SYSLOG(WARNING) << "Executing screenshot command.";
 
   // Fail if the delegate says screenshots are not allowed in this session.
   if (!screenshot_delegate_->IsScreenshotAllowed()) {
     CHROMEOS_SYSLOG(ERROR) << "Screenshots are not allowed.";
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE,
-        base::Bind(failed_callback_, base::Passed(base::WrapUnique(
-                                         new Payload(FAILURE_USER_INPUT)))));
+        base::Bind(failed_callback_, base::Passed(base::MakeUnique<Payload>(
+                                         FAILURE_USER_INPUT))));
   }
 
   aura::Window::Windows root_windows = ash::Shell::GetAllRootWindows();
 
   // Immediately fail if the upload url is invalid.
   if (!upload_url_.is_valid()) {
     CHROMEOS_SYSLOG(ERROR) << upload_url_ << " is not a valid URL.";
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE,
-        base::Bind(failed_callback_, base::Passed(base::WrapUnique(
-                                         new Payload(FAILURE_INVALID_URL)))));
+        base::Bind(failed_callback_, base::Passed(base::MakeUnique<Payload>(
+                                         FAILURE_INVALID_URL))));
     return;
   }
 
   // Immediately fail if there are no attached screens.
   if (root_windows.size() == 0) {
     CHROMEOS_SYSLOG(ERROR) << "No attached screens.";
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE,
-        base::Bind(failed_callback_, base::Passed(base::WrapUnique(new Payload(
-                                         FAILURE_SCREENSHOT_ACQUISITION)))));
+        base::Bind(failed_callback_, base::Passed(base::MakeUnique<Payload>(
+                                         FAILURE_SCREENSHOT_ACQUISITION))));
     return;
   }
 
   upload_job_ = screenshot_delegate_->CreateUploadJob(upload_url_, this);
   DCHECK(upload_job_);
 
   // Post tasks to the sequenced worker pool for taking screenshots on each
   // attached screen.
   num_pending_screenshots_ = root_windows.size();
   for (size_t screen = 0; screen < root_windows.size(); ++screen) {
     aura::Window* root_window = root_windows[screen];
     gfx::Rect rect = root_window->bounds();
     screenshot_delegate_->TakeSnapshot(
         root_window, rect,
         base::Bind(&RunStoreScreenshotOnTaskRunner,
                    base::Bind(&DeviceCommandScreenshotJob::StoreScreenshot,
                               weak_ptr_factory_.GetWeakPtr(), screen),
                    base::ThreadTaskRunnerHandle::Get()));
   }
 }
 
 void DeviceCommandScreenshotJob::TerminateImpl() {
   weak_ptr_factory_.InvalidateWeakPtrs();
 }
 
 }  // namespace policy