Return a unique_ptr from BinaryValue::CreateWithCopiedBuffer.

content/browser/renderer_host/pepper/pepper_socket_utils.cc

 // Copyright (c) 2012 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 "content/browser/renderer_host/pepper/pepper_socket_utils.h"
 
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
+#include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/strings/string_util.h"
 #include "build/build_config.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/common/content_client.h"
 #include "net/base/ip_address.h"
 #include "net/base/ip_endpoint.h"
@@ skipping 51 matching lines @@
     return false;
   }
 
   return true;
 }
 
 bool GetCertificateFields(const net::X509Certificate& cert,
                           ppapi::PPB_X509Certificate_Fields* fields) {
   const net::CertPrincipal& issuer = cert.issuer();
   fields->SetField(PP_X509CERTIFICATE_PRIVATE_ISSUER_COMMON_NAME,
-                   new base::StringValue(issuer.common_name));
+                   base::MakeUnique<base::StringValue>(issuer.common_name));

[dcheng, 2016/06/15 08:34:03]

We pass a created BinaryValue to SetField(), so I changed the signature of
SetField() and updated callers as needed.

   fields->SetField(PP_X509CERTIFICATE_PRIVATE_ISSUER_LOCALITY_NAME,
-                   new base::StringValue(issuer.locality_name));
-  fields->SetField(PP_X509CERTIFICATE_PRIVATE_ISSUER_STATE_OR_PROVINCE_NAME,
-                   new base::StringValue(issuer.state_or_province_name));
+                   base::MakeUnique<base::StringValue>(issuer.locality_name));
+  fields->SetField(
+      PP_X509CERTIFICATE_PRIVATE_ISSUER_STATE_OR_PROVINCE_NAME,
+      base::MakeUnique<base::StringValue>(issuer.state_or_province_name));
   fields->SetField(PP_X509CERTIFICATE_PRIVATE_ISSUER_COUNTRY_NAME,
-                   new base::StringValue(issuer.country_name));
-  fields->SetField(
-      PP_X509CERTIFICATE_PRIVATE_ISSUER_ORGANIZATION_NAME,
-      new base::StringValue(base::JoinString(issuer.organization_names, "\n")));
-  fields->SetField(
-      PP_X509CERTIFICATE_PRIVATE_ISSUER_ORGANIZATION_UNIT_NAME,
-      new base::StringValue(
-          base::JoinString(issuer.organization_unit_names, "\n")));
+                   base::MakeUnique<base::StringValue>(issuer.country_name));
+  fields->SetField(PP_X509CERTIFICATE_PRIVATE_ISSUER_ORGANIZATION_NAME,
+                   base::MakeUnique<base::StringValue>(
+                       base::JoinString(issuer.organization_names, "\n")));
+  fields->SetField(PP_X509CERTIFICATE_PRIVATE_ISSUER_ORGANIZATION_UNIT_NAME,
+                   base::MakeUnique<base::StringValue>(
+                       base::JoinString(issuer.organization_unit_names, "\n")));
 
   const net::CertPrincipal& subject = cert.subject();
   fields->SetField(PP_X509CERTIFICATE_PRIVATE_SUBJECT_COMMON_NAME,
-                   new base::StringValue(subject.common_name));
+                   base::MakeUnique<base::StringValue>(subject.common_name));
   fields->SetField(PP_X509CERTIFICATE_PRIVATE_SUBJECT_LOCALITY_NAME,
-                   new base::StringValue(subject.locality_name));
-  fields->SetField(PP_X509CERTIFICATE_PRIVATE_SUBJECT_STATE_OR_PROVINCE_NAME,
-                   new base::StringValue(subject.state_or_province_name));
+                   base::MakeUnique<base::StringValue>(subject.locality_name));
+  fields->SetField(
+      PP_X509CERTIFICATE_PRIVATE_SUBJECT_STATE_OR_PROVINCE_NAME,
+      base::MakeUnique<base::StringValue>(subject.state_or_province_name));
   fields->SetField(PP_X509CERTIFICATE_PRIVATE_SUBJECT_COUNTRY_NAME,
-                   new base::StringValue(subject.country_name));
-  fields->SetField(
-      PP_X509CERTIFICATE_PRIVATE_SUBJECT_ORGANIZATION_NAME,
-      new base::StringValue(
-          base::JoinString(subject.organization_names, "\n")));
-  fields->SetField(
-      PP_X509CERTIFICATE_PRIVATE_SUBJECT_ORGANIZATION_UNIT_NAME,
-      new base::StringValue(
-          base::JoinString(subject.organization_unit_names, "\n")));
+                   base::MakeUnique<base::StringValue>(subject.country_name));
+  fields->SetField(PP_X509CERTIFICATE_PRIVATE_SUBJECT_ORGANIZATION_NAME,
+                   base::MakeUnique<base::StringValue>(
+                       base::JoinString(subject.organization_names, "\n")));
+  fields->SetField(PP_X509CERTIFICATE_PRIVATE_SUBJECT_ORGANIZATION_UNIT_NAME,
+                   base::MakeUnique<base::StringValue>(base::JoinString(
+                       subject.organization_unit_names, "\n")));
 
   const std::string& serial_number = cert.serial_number();
   fields->SetField(PP_X509CERTIFICATE_PRIVATE_SERIAL_NUMBER,
                    base::BinaryValue::CreateWithCopiedBuffer(
                        serial_number.data(), serial_number.length()));
-  fields->SetField(PP_X509CERTIFICATE_PRIVATE_VALIDITY_NOT_BEFORE,
-                   new base::FundamentalValue(cert.valid_start().ToDoubleT()));
+  fields->SetField(
+      PP_X509CERTIFICATE_PRIVATE_VALIDITY_NOT_BEFORE,
+      base::MakeUnique<base::FundamentalValue>(cert.valid_start().ToDoubleT()));
   fields->SetField(PP_X509CERTIFICATE_PRIVATE_VALIDITY_NOT_AFTER,
-                   new base::FundamentalValue(cert.valid_expiry().ToDoubleT()));
+                   base::MakeUnique<base::FundamentalValue>(
+                       cert.valid_expiry().ToDoubleT()));
   std::string der;
   net::X509Certificate::GetDEREncoded(cert.os_cert_handle(), &der);
   fields->SetField(
       PP_X509CERTIFICATE_PRIVATE_RAW,
       base::BinaryValue::CreateWithCopiedBuffer(der.data(), der.length()));
   return true;
 }
 
 bool GetCertificateFields(const char* der,
                           uint32_t length,
@@ skipping 49 matching lines @@
 }
 
 void OpenUDPFirewallHole(const net::IPEndPoint& address,
                          FirewallHoleOpenCallback callback) {
   OpenFirewallHole(address, chromeos::FirewallHole::PortType::UDP, callback);
 }
 #endif  // defined(OS_CHROMEOS)
 
 }  // namespace pepper_socket_utils
 }  // namespace content