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_message_filter.h" | 5 #include "content/browser/renderer_host/pepper_message_filter.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
9 #include "base/callback.h" | 9 #include "base/callback.h" |
10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
160 GetAndSendNetworkList(); | 160 GetAndSendNetworkList(); |
161 } | 161 } |
162 | 162 |
163 net::HostResolver* PepperMessageFilter::GetHostResolver() { | 163 net::HostResolver* PepperMessageFilter::GetHostResolver() { |
164 return resource_context_ ? | 164 return resource_context_ ? |
165 resource_context_->GetHostResolver() : host_resolver_; | 165 resource_context_->GetHostResolver() : host_resolver_; |
166 } | 166 } |
167 | 167 |
168 net::CertVerifier* PepperMessageFilter::GetCertVerifier() { | 168 net::CertVerifier* PepperMessageFilter::GetCertVerifier() { |
169 if (!cert_verifier_.get()) | 169 if (!cert_verifier_.get()) |
170 cert_verifier_.reset(new net::CertVerifier()); | 170 cert_verifier_.reset(net::CertVerifier::CreateDefault()); |
171 | 171 |
172 return cert_verifier_.get(); | 172 return cert_verifier_.get(); |
173 } | 173 } |
174 | 174 |
175 uint32 PepperMessageFilter::AddAcceptedTCPSocket( | 175 uint32 PepperMessageFilter::AddAcceptedTCPSocket( |
176 int32 routing_id, | 176 int32 routing_id, |
177 uint32 plugin_dispatcher_id, | 177 uint32 plugin_dispatcher_id, |
178 net::StreamSocket* socket) { | 178 net::StreamSocket* socket) { |
179 scoped_ptr<net::StreamSocket> s(socket); | 179 scoped_ptr<net::StreamSocket> s(socket); |
180 | 180 |
(...skipping 706 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
887 network_copy.state = PP_NETWORKLIST_UP; | 887 network_copy.state = PP_NETWORKLIST_UP; |
888 network_copy.display_name = network.name; | 888 network_copy.display_name = network.name; |
889 network_copy.mtu = 0; | 889 network_copy.mtu = 0; |
890 } | 890 } |
891 for (NetworkMonitorIdSet::iterator it = network_monitor_ids_.begin(); | 891 for (NetworkMonitorIdSet::iterator it = network_monitor_ids_.begin(); |
892 it != network_monitor_ids_.end(); ++it) { | 892 it != network_monitor_ids_.end(); ++it) { |
893 Send(new PpapiMsg_PPBNetworkMonitor_NetworkList( | 893 Send(new PpapiMsg_PPBNetworkMonitor_NetworkList( |
894 ppapi::API_ID_PPB_NETWORKMANAGER_PRIVATE, *it, *list_copy)); | 894 ppapi::API_ID_PPB_NETWORKMANAGER_PRIVATE, *it, *list_copy)); |
895 } | 895 } |
896 } | 896 } |
OLD | NEW |