| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/browser/renderer_host/pepper/pepper_tcp_socket.h" | 5 #include "content/browser/renderer_host/pepper/pepper_tcp_socket.h" |
| 6 | 6 |
| 7 #include <string.h> | 7 #include <string.h> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
| (...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 245 fields->SetField(PP_X509CERTIFICATE_PRIVATE_SUBJECT_ORGANIZATION_NAME, | 245 fields->SetField(PP_X509CERTIFICATE_PRIVATE_SUBJECT_ORGANIZATION_NAME, |
| 246 new base::StringValue(JoinString(subject.organization_names, '\n'))); | 246 new base::StringValue(JoinString(subject.organization_names, '\n'))); |
| 247 fields->SetField(PP_X509CERTIFICATE_PRIVATE_SUBJECT_ORGANIZATION_UNIT_NAME, | 247 fields->SetField(PP_X509CERTIFICATE_PRIVATE_SUBJECT_ORGANIZATION_UNIT_NAME, |
| 248 new base::StringValue(JoinString(subject.organization_unit_names, '\n'))); | 248 new base::StringValue(JoinString(subject.organization_unit_names, '\n'))); |
| 249 | 249 |
| 250 const std::string& serial_number = cert.serial_number(); | 250 const std::string& serial_number = cert.serial_number(); |
| 251 fields->SetField(PP_X509CERTIFICATE_PRIVATE_SERIAL_NUMBER, | 251 fields->SetField(PP_X509CERTIFICATE_PRIVATE_SERIAL_NUMBER, |
| 252 base::BinaryValue::CreateWithCopiedBuffer(serial_number.data(), | 252 base::BinaryValue::CreateWithCopiedBuffer(serial_number.data(), |
| 253 serial_number.length())); | 253 serial_number.length())); |
| 254 fields->SetField(PP_X509CERTIFICATE_PRIVATE_VALIDITY_NOT_BEFORE, | 254 fields->SetField(PP_X509CERTIFICATE_PRIVATE_VALIDITY_NOT_BEFORE, |
| 255 base::Value::CreateDoubleValue(cert.valid_start().ToDoubleT())); | 255 new base::FundamentalValue(cert.valid_start().ToDoubleT())); |
| 256 fields->SetField(PP_X509CERTIFICATE_PRIVATE_VALIDITY_NOT_AFTER, | 256 fields->SetField(PP_X509CERTIFICATE_PRIVATE_VALIDITY_NOT_AFTER, |
| 257 base::Value::CreateDoubleValue(cert.valid_expiry().ToDoubleT())); | 257 new base::FundamentalValue(cert.valid_expiry().ToDoubleT())); |
| 258 std::string der; | 258 std::string der; |
| 259 net::X509Certificate::GetDEREncoded(cert.os_cert_handle(), &der); | 259 net::X509Certificate::GetDEREncoded(cert.os_cert_handle(), &der); |
| 260 fields->SetField(PP_X509CERTIFICATE_PRIVATE_RAW, | 260 fields->SetField(PP_X509CERTIFICATE_PRIVATE_RAW, |
| 261 base::BinaryValue::CreateWithCopiedBuffer(der.data(), der.length())); | 261 base::BinaryValue::CreateWithCopiedBuffer(der.data(), der.length())); |
| 262 return true; | 262 return true; |
| 263 } | 263 } |
| 264 | 264 |
| 265 // static | 265 // static |
| 266 bool PepperTCPSocket::GetCertificateFields( | 266 bool PepperTCPSocket::GetCertificateFields( |
| 267 const char* der, | 267 const char* der, |
| (...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 411 DCHECK_GT(write_buffer_->BytesRemaining(), 0); | 411 DCHECK_GT(write_buffer_->BytesRemaining(), 0); |
| 412 | 412 |
| 413 int result = socket_->Write(write_buffer_, write_buffer_->BytesRemaining(), | 413 int result = socket_->Write(write_buffer_, write_buffer_->BytesRemaining(), |
| 414 base::Bind(&PepperTCPSocket::OnWriteCompleted, | 414 base::Bind(&PepperTCPSocket::OnWriteCompleted, |
| 415 base::Unretained(this))); | 415 base::Unretained(this))); |
| 416 if (result != net::ERR_IO_PENDING) | 416 if (result != net::ERR_IO_PENDING) |
| 417 OnWriteCompleted(result); | 417 OnWriteCompleted(result); |
| 418 } | 418 } |
| 419 | 419 |
| 420 } // namespace content | 420 } // namespace content |
| OLD | NEW |