| Index: content/browser/renderer_host/pepper/pepper_socket_utils.cc | 
| diff --git a/content/browser/renderer_host/pepper/pepper_socket_utils.cc b/content/browser/renderer_host/pepper/pepper_socket_utils.cc | 
| index 822bc5659c16b156e6d2b2ced941af1da0ee7ee3..bf2a4c7fc08d4730bb5045927b60946382b60d0f 100644 | 
| --- a/content/browser/renderer_host/pepper/pepper_socket_utils.cc | 
| +++ b/content/browser/renderer_host/pepper/pepper_socket_utils.cc | 
| @@ -80,36 +80,36 @@ 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, | 
| -                   base::MakeUnique<base::StringValue>(issuer.common_name)); | 
| +                   base::MakeUnique<base::Value>(issuer.common_name)); | 
| fields->SetField(PP_X509CERTIFICATE_PRIVATE_ISSUER_LOCALITY_NAME, | 
| -                   base::MakeUnique<base::StringValue>(issuer.locality_name)); | 
| +                   base::MakeUnique<base::Value>(issuer.locality_name)); | 
| fields->SetField( | 
| PP_X509CERTIFICATE_PRIVATE_ISSUER_STATE_OR_PROVINCE_NAME, | 
| -      base::MakeUnique<base::StringValue>(issuer.state_or_province_name)); | 
| +      base::MakeUnique<base::Value>(issuer.state_or_province_name)); | 
| fields->SetField(PP_X509CERTIFICATE_PRIVATE_ISSUER_COUNTRY_NAME, | 
| -                   base::MakeUnique<base::StringValue>(issuer.country_name)); | 
| +                   base::MakeUnique<base::Value>(issuer.country_name)); | 
| fields->SetField(PP_X509CERTIFICATE_PRIVATE_ISSUER_ORGANIZATION_NAME, | 
| -                   base::MakeUnique<base::StringValue>( | 
| +                   base::MakeUnique<base::Value>( | 
| base::JoinString(issuer.organization_names, "\n"))); | 
| fields->SetField(PP_X509CERTIFICATE_PRIVATE_ISSUER_ORGANIZATION_UNIT_NAME, | 
| -                   base::MakeUnique<base::StringValue>( | 
| +                   base::MakeUnique<base::Value>( | 
| base::JoinString(issuer.organization_unit_names, "\n"))); | 
|  | 
| const net::CertPrincipal& subject = cert.subject(); | 
| fields->SetField(PP_X509CERTIFICATE_PRIVATE_SUBJECT_COMMON_NAME, | 
| -                   base::MakeUnique<base::StringValue>(subject.common_name)); | 
| +                   base::MakeUnique<base::Value>(subject.common_name)); | 
| fields->SetField(PP_X509CERTIFICATE_PRIVATE_SUBJECT_LOCALITY_NAME, | 
| -                   base::MakeUnique<base::StringValue>(subject.locality_name)); | 
| +                   base::MakeUnique<base::Value>(subject.locality_name)); | 
| fields->SetField( | 
| PP_X509CERTIFICATE_PRIVATE_SUBJECT_STATE_OR_PROVINCE_NAME, | 
| -      base::MakeUnique<base::StringValue>(subject.state_or_province_name)); | 
| +      base::MakeUnique<base::Value>(subject.state_or_province_name)); | 
| fields->SetField(PP_X509CERTIFICATE_PRIVATE_SUBJECT_COUNTRY_NAME, | 
| -                   base::MakeUnique<base::StringValue>(subject.country_name)); | 
| +                   base::MakeUnique<base::Value>(subject.country_name)); | 
| fields->SetField(PP_X509CERTIFICATE_PRIVATE_SUBJECT_ORGANIZATION_NAME, | 
| -                   base::MakeUnique<base::StringValue>( | 
| +                   base::MakeUnique<base::Value>( | 
| base::JoinString(subject.organization_names, "\n"))); | 
| fields->SetField(PP_X509CERTIFICATE_PRIVATE_SUBJECT_ORGANIZATION_UNIT_NAME, | 
| -                   base::MakeUnique<base::StringValue>(base::JoinString( | 
| +                   base::MakeUnique<base::Value>(base::JoinString( | 
| subject.organization_unit_names, "\n"))); | 
|  | 
| const std::string& serial_number = cert.serial_number(); | 
|  |