Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(405)

Side by Side Diff: content/browser/renderer_host/pepper/pepper_tcp_socket.cc

Issue 12518036: net: move host_resolver files from net/base to net/dns (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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"
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/string_util.h" 13 #include "base/string_util.h"
14 #include "content/browser/renderer_host/pepper/pepper_message_filter.h" 14 #include "content/browser/renderer_host/pepper/pepper_message_filter.h"
15 #include "content/public/browser/browser_thread.h" 15 #include "content/public/browser/browser_thread.h"
16 #include "net/base/cert_verifier.h" 16 #include "net/base/cert_verifier.h"
17 #include "net/base/host_port_pair.h" 17 #include "net/base/host_port_pair.h"
18 #include "net/base/host_resolver.h"
19 #include "net/base/io_buffer.h" 18 #include "net/base/io_buffer.h"
20 #include "net/base/ip_endpoint.h" 19 #include "net/base/ip_endpoint.h"
21 #include "net/base/net_errors.h" 20 #include "net/base/net_errors.h"
22 #include "net/base/single_request_host_resolver.h"
23 #include "net/base/x509_certificate.h" 21 #include "net/base/x509_certificate.h"
22 #include "net/dns/host_resolver.h"
23 #include "net/dns/single_request_host_resolver.h"
24 #include "net/socket/client_socket_factory.h" 24 #include "net/socket/client_socket_factory.h"
25 #include "net/socket/client_socket_handle.h" 25 #include "net/socket/client_socket_handle.h"
26 #include "net/socket/ssl_client_socket.h" 26 #include "net/socket/ssl_client_socket.h"
27 #include "net/socket/tcp_client_socket.h" 27 #include "net/socket/tcp_client_socket.h"
28 #include "ppapi/proxy/ppapi_messages.h" 28 #include "ppapi/proxy/ppapi_messages.h"
29 #include "ppapi/shared_impl/private/net_address_private_impl.h" 29 #include "ppapi/shared_impl/private/net_address_private_impl.h"
30 #include "ppapi/shared_impl/private/ppb_x509_certificate_private_shared.h" 30 #include "ppapi/shared_impl/private/ppb_x509_certificate_private_shared.h"
31 #include "ppapi/shared_impl/private/tcp_socket_private_impl.h" 31 #include "ppapi/shared_impl/private/tcp_socket_private_impl.h"
32 32
33 using ppapi::NetAddressPrivateImpl; 33 using ppapi::NetAddressPrivateImpl;
(...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after
444 DCHECK_GT(write_buffer_->BytesRemaining(), 0); 444 DCHECK_GT(write_buffer_->BytesRemaining(), 0);
445 445
446 int result = socket_->Write(write_buffer_, write_buffer_->BytesRemaining(), 446 int result = socket_->Write(write_buffer_, write_buffer_->BytesRemaining(),
447 base::Bind(&PepperTCPSocket::OnWriteCompleted, 447 base::Bind(&PepperTCPSocket::OnWriteCompleted,
448 base::Unretained(this))); 448 base::Unretained(this)));
449 if (result != net::ERR_IO_PENDING) 449 if (result != net::ERR_IO_PENDING)
450 OnWriteCompleted(result); 450 OnWriteCompleted(result);
451 } 451 }
452 452
453 } // namespace content 453 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698