diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-23 21:42:07 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-23 21:42:07 +0000 |
| commit | 049d4ee048d1f09b0f77c23c5060c5ea5504a00b (patch) | |
| tree | 1fc9e4746bb79acf89ef5432ed12505f41303714 /net/base/dns_resolution_observer.cc | |
| parent | 03007738016f5b76de071d3b8c726a10a5c0c841 (diff) | |
| download | chromium_src-049d4ee048d1f09b0f77c23c5060c5ea5504a00b.zip chromium_src-049d4ee048d1f09b0f77c23c5060c5ea5504a00b.tar.gz chromium_src-049d4ee048d1f09b0f77c23c5060c5ea5504a00b.tar.bz2 | |
Port:
- net/base/dns_resolution_observer.cc
- net/http/http_network_transaction.cc
- net/url_request/url_request_filter.cc
Add to net library the above and:
- net/base/dns_resolution_observer.cc
- net/base/upload_data_stream.cc
- net/http/http_network_layer.cc
- net/proxy/proxy_resolver_fixed.cc
- net/proxy/proxy_service.cc
- net/url_request/url_request_job_manager.cc
Add to net_unittests:
- net/http/http_network_transaction_unittest.cc
- net/http/http_transaction_unittest.cc
- net/http/http_util_unittest.cc
Patch by Paweł Hajdan jr <phajdan.jr@gmail.com>
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3867 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/dns_resolution_observer.cc')
| -rw-r--r-- | net/base/dns_resolution_observer.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/base/dns_resolution_observer.cc b/net/base/dns_resolution_observer.cc index 71c2c10..46416d4 100644 --- a/net/base/dns_resolution_observer.cc +++ b/net/base/dns_resolution_observer.cc @@ -5,11 +5,10 @@ // This file supports network stack independent notification of progress // towards resolving a hostname. -#include <windows.h> -#include <string> - #include "net/base/dns_resolution_observer.h" +#include <string> + #include "base/logging.h" namespace net { |